#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
#endif
static int str_exitall_cb(void);
static int str_cpumask_cb(void *, unsigned int *);
+static int str_fst_cb(void *, const char *);
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
},
{
.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 = {
#ifdef FIO_HAVE_SYSLET
{ .ival = "syslet-rw", },
#endif
+ { .ival = "cpuio", },
+ { .ival = "external", },
},
},
{
.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,
+ .cb = str_fst_cb,
.off1 = td_var_offset(file_service_type),
.help = "How to select which file to service next",
.def = "roundrobin",
.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",
},
{
.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
{
.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 = "cmdhelp",
- .has_arg = required_argument,
+ .has_arg = optional_argument,
.val = 'c',
},
{
static int def_timeout = 0;
-static char fio_version_string[] = "fio 1.11";
+static char fio_version_string[] = "fio 1.13";
static char **ini_file;
static int max_jobs = MAX_JOBS;
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.
*/
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
*/
- 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;
/*
/*
* The low water mark cannot be bigger than the iodepth
*/
- if (td->iodepth_low > td->iodepth || !td->iodepth_low)
- td->iodepth_low = td->iodepth;
+ if (td->iodepth_low > td->iodepth || !td->iodepth_low) {
+ /*
+ * syslet work around - if the workload is sequential,
+ * we want to let the queue drain all the way down to
+ * avoid seeking between async threads
+ */
+ if (!strcmp(td->io_ops->name, "syslet-rw") && !td_random(td))
+ td->iodepth_low = 1;
+ else
+ td->iodepth_low = td->iodepth;
+ }
/*
* If batch number isn't set, default to the same as 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;
}
/*
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
struct stat sb;
int numjobs, i;
struct fio_file *f;
+ const char *engine;
+ int fn_given;
/*
* the def_thread is just for options, it's not a real job
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->use_thread)
+ nr_thread++;
+ else
+ nr_process++;
if (td->odirect)
td->io_ops->flags |= FIO_RAWIO;
+ fn_given = (int) td->filename;
+ if (!td->filename)
+ td->filename = strdup(jobname);
+
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 (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) {
+ if (td->filetype == FIO_TYPE_FILE) {
char tmp[PATH_MAX];
int len = 0;
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));
f->fd = -1;
- if (td->filename)
+ if (fn_given)
sprintf(tmp + len, "%s", td->filename);
else
- sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
+ sprintf(tmp + len, "%s.%d.%d", td->filename, td->thread_number, i);
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];
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;
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;
int fd, num_maps, blocks, i;
struct fio_file *f;
- if (td->io_ops->flags & FIO_CPUIO)
+ if (td->io_ops->flags & FIO_DISKLESSIO)
return 0;
fd = open("/dev/urandom", O_RDONLY);
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));
}
/*
* Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
*/
-static char *get_mmap_file(const char *str)
+static char *get_opt_postfix(const char *str)
{
char *p = strstr(str, ":");
struct thread_data *td = data;
if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
- td->mmapfile = get_mmap_file(mem);
+ td->mmapfile = get_opt_postfix(mem);
if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) {
log_err("fio: mmaphuge:/path/to/file\n");
return 1;
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;
return 0;
}
+static int str_fst_cb(void *data, const char *str)
+{
+ struct thread_data *td = data;
+ char *nr = get_opt_postfix(str);
+
+ td->file_service_nr = 1;
+ if (nr)
+ td->file_service_nr = atoi(nr);
+
+ return 0;
+}
+
/*
* This is our [ini] type file parser.
*/
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);
projects / fio.git / blobdiff