projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OOM fixes
[fio.git]
/
init.c
diff --git
a/init.c
b/init.c
index 33a1c281c696607dfea6c3124bec80d8372141cb..bca8424a9e49348c05b99a272c9d96789b469559 100644
(file)
--- a/
init.c
+++ b/
init.c
@@
-22,7
+22,6
@@
#define td_var_offset(var) ((size_t) &((struct thread_data *)0)->var)
#define td_var_offset(var) ((size_t) &((struct thread_data *)0)->var)
-static int str_ioengine_cb(void *, const char *);
static int str_mem_cb(void *, const char *);
static int str_lockmem_cb(void *, unsigned long *);
#ifdef FIO_HAVE_IOPRIO
static int str_mem_cb(void *, const char *);
static int str_lockmem_cb(void *, unsigned long *);
#ifdef FIO_HAVE_IOPRIO
@@
-80,8
+79,8
@@
static struct fio_option options[] = {
},
{
.name = "ioengine",
},
{
.name = "ioengine",
- .type = FIO_OPT_STR,
- .
cb = str_ioengine_cb
,
+ .type = FIO_OPT_STR
_STORE
,
+ .
off1 = td_var_offset(ioengine)
,
.help = "IO engine to use",
.def = "sync",
.posval = {
.help = "IO engine to use",
.def = "sync",
.posval = {
@@
-103,6
+102,8
@@
static struct fio_option options[] = {
#ifdef FIO_HAVE_SYSLET
{ .ival = "syslet-rw", },
#endif
#ifdef FIO_HAVE_SYSLET
{ .ival = "syslet-rw", },
#endif
+ { .ival = "cpuio", },
+ { .ival = "external", },
},
},
{
},
},
{
@@
-180,6
+181,12
@@
static struct fio_option options[] = {
.help = "Split job workload between this number of files",
.def = "1",
},
.help = "Split job workload between this number of files",
.def = "1",
},
+ {
+ .name = "openfiles",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(open_files),
+ .help = "Number of files to keep open at the same time",
+ },
{
.name = "file_service_type",
.type = FIO_OPT_STR,
{
.name = "file_service_type",
.type = FIO_OPT_STR,
@@
-394,7
+401,7
@@
static struct fio_option options[] = {
.name = "thinktime_spin",
.type = FIO_OPT_INT,
.off1 = td_var_offset(thinktime_spin),
.name = "thinktime_spin",
.type = FIO_OPT_INT,
.off1 = td_var_offset(thinktime_spin),
- .help = "Start thinktime by spinning this amount (usec)",
+ .help = "Start think
time by spinning this amount (usec)",
.def = "0",
},
{
.def = "0",
},
{
@@
-468,7
+475,8
@@
static struct fio_option options[] = {
.name = "cpuchunks",
.type = FIO_OPT_INT,
.off1 = td_var_offset(cpucycle),
.name = "cpuchunks",
.type = FIO_OPT_INT,
.off1 = td_var_offset(cpucycle),
- .help = "Length of the CPU burn cycles",
+ .help = "Length of the CPU burn cycles (usecs)",
+ .def = "50000",
},
#ifdef FIO_HAVE_CPU_AFFINITY
{
},
#ifdef FIO_HAVE_CPU_AFFINITY
{
@@
-529,6
+537,12
@@
static struct fio_option options[] = {
.help = "When using hugepages, specify size of each page",
.def = __stringify(FIO_HUGE_PAGE),
},
.help = "When using hugepages, specify size of each page",
.def = __stringify(FIO_HUGE_PAGE),
},
+ {
+ .name = "group_reporting",
+ .type = FIO_OPT_STR_SET,
+ .off1 = td_var_offset(group_reporting),
+ .help = "Do reporting on a per-group basis",
+ },
{
.name = NULL,
},
{
.name = NULL,
},
@@
-580,7
+594,7
@@
static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
},
{
.name = "cmdhelp",
},
{
.name = "cmdhelp",
- .has_arg =
required
_argument,
+ .has_arg =
optional
_argument,
.val = 'c',
},
{
.val = 'c',
},
{
@@
-590,7
+604,7
@@
static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
static int def_timeout = 0;
static int def_timeout = 0;
-static char fio_version_string[] = "fio 1.1
1
";
+static char fio_version_string[] = "fio 1.1
3
";
static char **ini_file;
static int max_jobs = MAX_JOBS;
static char **ini_file;
static int max_jobs = MAX_JOBS;
@@
-607,6
+621,16
@@
FILE *f_err = NULL;
static int write_lat_log = 0;
int write_bw_log = 0;
static int write_lat_log = 0;
int write_bw_log = 0;
+FILE *get_f_out()
+{
+ return f_out;
+}
+
+FILE *get_f_err()
+{
+ return f_err;
+}
+
/*
* Return a free job structure.
*/
/*
* Return a free job structure.
*/
@@
-657,13
+681,13
@@
static void fixup_options(struct thread_data *td)
td->iodepth = 1;
else {
if (!td->iodepth)
td->iodepth = 1;
else {
if (!td->iodepth)
- td->iodepth = td->
nr
_files;
+ td->iodepth = td->
open
_files;
}
/*
* only really works for sequential io for now, and with 1 file
*/
}
/*
* only really works for sequential io for now, and with 1 file
*/
- if (td->zone_size && td_random(td) && td->
nr
_files == 1)
+ if (td->zone_size && td_random(td) && td->
open
_files == 1)
td->zone_size = 0;
/*
td->zone_size = 0;
/*
@@
-725,6
+749,9
@@
static void fixup_options(struct thread_data *td)
*/
if (td->iodepth_batch > td->iodepth || !td->iodepth_batch)
td->iodepth_batch = td->iodepth;
*/
if (td->iodepth_batch > td->iodepth || !td->iodepth_batch)
td->iodepth_batch = td->iodepth;
+
+ if (td->open_files > td->nr_files || !td->open_files)
+ td->open_files = td->nr_files;
}
/*
}
/*
@@
-748,6
+775,20
@@
static char *to_kmg(unsigned int val)
return buf;
}
return buf;
}
+/* External engines are specified by "external:name.o") */
+static const char *get_engine_name(const char *str)
+{
+ char *p = strstr(str, ":");
+
+ if (!p)
+ return str;
+
+ p++;
+ strip_blank_front(&p);
+ strip_blank_end(p);
+ return p;
+}
+
/*
* Adds a job to the list of things todo. Sanitizes the various options
* to make sure we don't have conflicts, and initializes various
/*
* Adds a job to the list of things todo. Sanitizes the various options
* to make sure we don't have conflicts, and initializes various
@@
-760,6
+801,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
struct stat sb;
int numjobs, i;
struct fio_file *f;
struct stat sb;
int numjobs, i;
struct fio_file *f;
+ const char *engine;
/*
* the def_thread is just for options, it's not a real job
/*
* the def_thread is just for options, it's not a real job
@@
-767,13
+809,21
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (td == &def_thread)
return 0;
if (td == &def_thread)
return 0;
- assert(td->io_ops);
+ engine = get_engine_name(td->ioengine);
+ td->io_ops = load_ioengine(td, engine);
+ if (!td->io_ops) {
+ log_err("fio: failed to load engine %s\n", engine);
+ return 1;
+ }
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;
+ if (!td->filename)
+ td->filename = strdup(jobname);
+
td->filetype = FIO_TYPE_FILE;
td->filetype = FIO_TYPE_FILE;
- if (
td->filename &&
!lstat(td->filename, &sb)) {
+ if (!lstat(td->filename, &sb)) {
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
if (S_ISBLK(sb.st_mode))
td->filetype = FIO_TYPE_BD;
else if (S_ISCHR(sb.st_mode))
@@
-785,7
+835,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (td->filename)
td->nr_uniq_files = 1;
else
if (td->filename)
td->nr_uniq_files = 1;
else
- td->nr_uniq_files = td->
nr
_files;
+ td->nr_uniq_files = td->
open
_files;
if (td->filetype == FIO_TYPE_FILE || td->filename) {
char tmp[PATH_MAX];
if (td->filetype == FIO_TYPE_FILE || td->filename) {
char tmp[PATH_MAX];
@@
-804,7
+854,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
len = sprintf(tmp, "%s/", td->directory);
}
len = sprintf(tmp, "%s/", td->directory);
}
- td->files = malloc(sizeof(struct fio_file) * td->
nr
_files);
+ td->files = malloc(sizeof(struct fio_file) * td->
open
_files);
for_each_file(td, f, i) {
memset(f, 0, sizeof(*f));
for_each_file(td, f, i) {
memset(f, 0, sizeof(*f));
@@
-817,7
+867,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
f->file_name = strdup(tmp);
}
} else {
f->file_name = strdup(tmp);
}
} else {
- td->nr_files = 1;
+ td->
open_files = td->
nr_files = 1;
td->files = malloc(sizeof(struct fio_file));
f = &td->files[0];
td->files = malloc(sizeof(struct fio_file));
f = &td->files[0];
@@
-831,7
+881,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
f->file_offset = td->start_offset;
}
f->file_offset = td->start_offset;
}
-
fio_sem_init(&td->mutex,
0);
+
td->mutex = fio_sem_init(
0);
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
@@
-857,7
+907,7
@@
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
if (!terse_output) {
if (!job_add_num) {
if (!terse_output) {
if (!job_add_num) {
- if (
td->io_ops->flags & FIO_CPUIO
)
+ if (
!strcmp(td->io_ops->name, "cpuio")
)
fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
else {
char *c1, *c2, *c3, *c4;
fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle);
else {
char *c1, *c2, *c3, *c4;
@@
-912,7
+962,7
@@
int init_random_state(struct thread_data *td)
int fd, num_maps, blocks, i;
struct fio_file *f;
int fd, num_maps, blocks, i;
struct fio_file *f;
- if (td->io_ops->flags & FIO_
CPU
IO)
+ if (td->io_ops->flags & FIO_
DISKLESS
IO)
return 0;
fd = open("/dev/urandom", O_RDONLY);
return 0;
fd = open("/dev/urandom", O_RDONLY);
@@
-947,6
+997,10
@@
int init_random_state(struct thread_data *td)
blocks = (f->real_file_size + td->rw_min_bs - 1) / td->rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
f->file_map = malloc(num_maps * sizeof(long));
blocks = (f->real_file_size + td->rw_min_bs - 1) / td->rw_min_bs;
num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
f->file_map = malloc(num_maps * sizeof(long));
+ if (!f->file_map) {
+ log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");
+ return 1;
+ }
f->num_maps = num_maps;
memset(f->file_map, 0, num_maps * sizeof(long));
}
f->num_maps = num_maps;
memset(f->file_map, 0, num_maps * sizeof(long));
}
@@
-1017,17
+1071,6
@@
static int str_mem_cb(void *data, const char *mem)
return 0;
}
return 0;
}
-static int str_ioengine_cb(void *data, const char *str)
-{
- struct thread_data *td = data;
-
- td->io_ops = load_ioengine(td, str);
- if (td->io_ops)
- return 0;
-
- return 1;
-}
-
static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
{
mlock_size = *val;
static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
{
mlock_size = *val;
@@
-1197,7
+1240,7
@@
static int parse_cmd_line(int argc, char *argv[])
struct thread_data *td = NULL;
int c, ini_idx = 0, lidx, ret, dont_add_job = 0;
struct thread_data *td = NULL;
int c, ini_idx = 0, lidx, ret, dont_add_job = 0;
- while ((c = getopt_long(argc, argv, "", long_options, &lidx)) != -1) {
+ while ((c = getopt_long
_only
(argc, argv, "", long_options, &lidx)) != -1) {
switch (c) {
case 't':
def_timeout = atoi(optarg);
switch (c) {
case 't':
def_timeout = atoi(optarg);