#define td_var_offset(var) ((size_t) &((struct thread_data *)0)->var)
-static int str_rw_cb(void *, const char *);
-static int str_ioengine_cb(void *, const char *);
static int str_mem_cb(void *, const char *);
-static int str_verify_cb(void *, const char *);
static int str_lockmem_cb(void *, unsigned long *);
#ifdef FIO_HAVE_IOPRIO
static int str_prio_cb(void *, unsigned int *);
#endif
static int str_exitall_cb(void);
static int str_cpumask_cb(void *, unsigned int *);
+static int str_fst_cb(void *, const char *);
+static int str_filename_cb(void *, const char *);
+static int str_directory_cb(void *, const char *);
+static int str_opendir_cb(void *, const char *);
#define __stringify_1(x) #x
#define __stringify(x) __stringify_1(x)
* Map of job/command line options
*/
static struct fio_option options[] = {
+ {
+ .name = "description",
+ .type = FIO_OPT_STR_STORE,
+ .off1 = td_var_offset(description),
+ .help = "Text job description",
+ },
{
.name = "name",
.type = FIO_OPT_STR_STORE,
.name = "directory",
.type = FIO_OPT_STR_STORE,
.off1 = td_var_offset(directory),
+ .cb = str_directory_cb,
.help = "Directory to store files in",
},
{
.name = "filename",
.type = FIO_OPT_STR_STORE,
.off1 = td_var_offset(filename),
- .help = "Force the use of a specific file",
+ .cb = str_filename_cb,
+ .help = "File(s) to use for the workload",
+ },
+ {
+ .name = "opendir",
+ .type = FIO_OPT_STR_STORE,
+ .off1 = td_var_offset(opendir),
+ .cb = str_opendir_cb,
+ .help = "Recursively add files from this directory and down",
},
{
.name = "rw",
.type = FIO_OPT_STR,
- .cb = str_rw_cb,
+ .off1 = td_var_offset(td_ddir),
.help = "IO direction",
.def = "read",
- .posval = { "read", "write", "randwrite", "randread", "rw",
- "randrw", },
+ .posval = {
+ { .ival = "read",
+ .oval = TD_DDIR_READ,
+ .help = "Sequential read",
+ },
+ { .ival = "write",
+ .oval = TD_DDIR_WRITE,
+ .help = "Sequential write",
+ },
+ { .ival = "randread",
+ .oval = TD_DDIR_RANDREAD,
+ .help = "Random read",
+ },
+ { .ival = "randwrite",
+ .oval = TD_DDIR_RANDWRITE,
+ .help = "Random write",
+ },
+ { .ival = "rw",
+ .oval = TD_DDIR_RW,
+ .help = "Sequential read and write mix",
+ },
+ { .ival = "randrw",
+ .oval = TD_DDIR_RANDRW,
+ .help = "Random read and write mix"
+ },
+ },
},
{
.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 = { "sync", "libaio", "posixaio", "mmap", "splice",
- "sg", "null", },
+ .posval = {
+ { .ival = "sync",
+ .help = "Use read/write",
+ },
+#ifdef FIO_HAVE_LIBAIO
+ { .ival = "libaio",
+ .help = "Linux native asynchronous IO",
+ },
+#endif
+#ifdef FIO_HAVE_POSIXAIO
+ { .ival = "posixaio",
+ .help = "POSIX asynchronous IO",
+ },
+#endif
+ { .ival = "mmap",
+ .help = "Memory mapped IO",
+ },
+#ifdef FIO_HAVE_SPLICE
+ { .ival = "splice",
+ .help = "splice/vmsplice based IO",
+ },
+#endif
+#ifdef FIO_HAVE_SGIO
+ { .ival = "sg",
+ .help = "SCSI generic v3 IO",
+ },
+#endif
+ { .ival = "null",
+ .help = "Testing engine (no data transfer)",
+ },
+ { .ival = "net",
+ .help = "Network IO",
+ },
+#ifdef FIO_HAVE_SYSLET
+ { .ival = "syslet-rw",
+ .help = "syslet enabled async pread/pwrite IO",
+ },
+#endif
+ { .ival = "cpuio",
+ .help = "CPU cycler burner engine",
+ },
+ { .ival = "external",
+ .help = "Load external engine (append name)",
+ },
+ },
},
{
.name = "iodepth",
.help = "Amount of IO buffers to keep in flight",
.def = "1",
},
+ {
+ .name = "iodepth_batch",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(iodepth_batch),
+ .help = "Number of IO to submit in one go",
+ },
+ {
+ .name = "iodepth_low",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(iodepth_low),
+ .help = "Low water mark for queuing depth",
+ },
{
.name = "size",
.type = FIO_OPT_STR_VAL,
.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",
+ .posval = {
+ { .ival = "random",
+ .oval = FIO_FSERVICE_RANDOM,
+ .help = "Choose a file at random",
+ },
+ { .ival = "roundrobin",
+ .oval = FIO_FSERVICE_RR,
+ .help = "Round robin select files",
+ },
+ },
+ },
{
.name = "fsync",
.type = FIO_OPT_INT,
.name = "mem",
.type = FIO_OPT_STR,
.cb = str_mem_cb,
+ .off1 = td_var_offset(mem_type),
.help = "Backing type for IO buffers",
.def = "malloc",
- .posval = { "malloc", "shm", "shmhuge", "mmap", "mmaphuge", },
+ .posval = {
+ { .ival = "malloc",
+ .oval = MEM_MALLOC,
+ .help = "Use malloc(3) for IO buffers",
+ },
+ { .ival = "shm",
+ .oval = MEM_SHM,
+ .help = "Use shared memory segments for IO buffers",
+ },
+#ifdef FIO_HAVE_HUGETLB
+ { .ival = "shmhuge",
+ .oval = MEM_SHMHUGE,
+ .help = "Like shm, but use huge pages",
+ },
+#endif
+ { .ival = "mmap",
+ .oval = MEM_MMAP,
+ .help = "Use mmap(2) (file or anon) for IO buffers",
+ },
+#ifdef FIO_HAVE_HUGETLB
+ { .ival = "mmaphuge",
+ .oval = MEM_MMAPHUGE,
+ .help = "Like mmap, but use huge pages",
+ },
+#endif
+ },
},
{
.name = "verify",
.type = FIO_OPT_STR,
- .cb = str_verify_cb,
- .help = "Verify sum function",
+ .off1 = td_var_offset(verify),
+ .help = "Verify data written",
.def = "0",
- .posval = { "crc32", "md5", },
+ .posval = {
+ { .ival = "0",
+ .oval = VERIFY_NONE,
+ .help = "Don't do IO verification",
+ },
+ { .ival = "crc32",
+ .oval = VERIFY_CRC32,
+ .help = "Use crc32 checksums for verification",
+ },
+ { .ival = "md5",
+ .oval = VERIFY_MD5,
+ .help = "Use md5 checksums for verification",
+ },
+ },
},
{
.name = "write_iolog",
.help = "Idle time between IO buffers (usec)",
.def = "0",
},
+ {
+ .name = "thinktime_spin",
+ .type = FIO_OPT_INT,
+ .off1 = td_var_offset(thinktime_spin),
+ .help = "Start think time by spinning this amount (usec)",
+ .def = "0",
+ },
{
.name = "thinktime_blocks",
.type = FIO_OPT_INT,
.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 = "Include fsync at the end of job",
.def = "0",
},
+ {
+ .name = "fsync_on_close",
+ .type = FIO_OPT_BOOL,
+ .off1 = td_var_offset(fsync_on_close),
+ .help = "fsync files on close",
+ .def = "0",
+ },
{
.name = "unlink",
.type = FIO_OPT_BOOL,
.off1 = td_var_offset(unlink),
.help = "Unlink created files after job has completed",
- .def = "1",
+ .def = "0",
},
{
.name = "exitall",
.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.14";
static char **ini_file;
static int max_jobs = MAX_JOBS;
FILE *f_err = NULL;
static int write_lat_log = 0;
-static int write_bw_log = 0;
+int write_bw_log = 0;
+
+static int prev_group_jobs;
+
+FILE *get_f_out()
+{
+ return f_out;
+}
+
+FILE *get_f_err()
+{
+ return f_err;
+}
/*
* Return a free job structure.
if (td == &def_thread)
return;
+ if (td->error)
+ fprintf(f_out, "fio: %s\n", td->verror);
+
memset(&threads[td->thread_number - 1], 0, sizeof(*td));
thread_number--;
}
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->sequential && td->nr_files == 1)
+ if (td->zone_size && td_random(td) && td->open_files == 1)
td->zone_size = 0;
/*
log_err("fio: bs_unaligned may not work with raw io\n");
/*
- * O_DIRECT and char doesn't mix, clear that flag if necessary.
+ * thinktime_spin must be less than thinktime
+ */
+ if (td->thinktime_spin > td->thinktime)
+ td->thinktime_spin = td->thinktime;
+
+ /*
+ * The low water mark cannot be bigger than the 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->filetype == FIO_TYPE_CHAR && td->odirect)
- td->odirect = 0;
+ if (td->iodepth_batch > td->iodepth || !td->iodepth_batch)
+ td->iodepth_batch = td->iodepth;
+
+ if (td->nr_files > td->files_index)
+ td->nr_files = td->files_index;
+
+ if (td->open_files > td->nr_files || !td->open_files)
+ td->open_files = td->nr_files;
}
/*
static char *to_kmg(unsigned int val)
{
char *buf = malloc(32);
- char post[] = { 0, 'K', 'M', 'G', 'P', 0 };
+ char post[] = { 0, 'K', 'M', 'G', 'P', 'E', 0 };
char *p = post;
do {
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
*/
static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
{
- const char *ddir_str[] = { "read", "write", "randread", "randwrite",
- "rw", NULL, "randrw" };
- struct stat sb;
- int numjobs, ddir, i;
+ const char *ddir_str[] = { NULL, "read", "write", "rw", NULL,
+ "randread", "randwrite", "randrw" };
+ unsigned int i;
struct fio_file *f;
+ const char *engine;
+ char fname[PATH_MAX];
+ int numjobs;
/*
* the def_thread is just for options, it's not a real job
if (td == &def_thread)
return 0;
- assert(td->io_ops);
-
- if (td->odirect)
- td->io_ops->flags |= FIO_RAWIO;
-
- td->filetype = FIO_TYPE_FILE;
- if (!stat(jobname, &sb)) {
- if (S_ISBLK(sb.st_mode))
- td->filetype = FIO_TYPE_BD;
- else if (S_ISCHR(sb.st_mode))
- td->filetype = FIO_TYPE_CHAR;
+ 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;
}
- fixup_options(td);
-
- if (td->filename)
- td->nr_uniq_files = 1;
+ if (td->use_thread)
+ nr_thread++;
else
- td->nr_uniq_files = td->nr_files;
+ nr_process++;
- if (td->filetype == FIO_TYPE_FILE || td->filename) {
- char tmp[PATH_MAX];
- int len = 0;
-
- if (td->directory && td->directory[0] != '\0')
- len = sprintf(tmp, "%s/", td->directory);
+ if (td->odirect)
+ td->io_ops->flags |= FIO_RAWIO;
- td->files = malloc(sizeof(struct fio_file) * td->nr_files);
+ if (!td->filename && !td->files_index) {
+ td->filename = strdup(jobname);
- for_each_file(td, f, i) {
- memset(f, 0, sizeof(*f));
- f->fd = -1;
-
- if (td->filename)
- sprintf(tmp + len, "%s", td->filename);
- else
- sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
- f->file_name = strdup(tmp);
+ if (td->nr_files == 1)
+ add_file(td, td->filename);
+ else {
+ for (i = 0; i < td->nr_files; i++) {
+ sprintf(fname, "%s.%d.%d", td->filename, td->thread_number, i);
+ add_file(td, fname);
+ }
}
- } else {
- td->nr_files = 1;
- td->files = malloc(sizeof(struct fio_file));
- f = &td->files[0];
-
- memset(f, 0, sizeof(*f));
- f->fd = -1;
- f->file_name = strdup(jobname);
}
+ fixup_options(td);
+
for_each_file(td, f, i) {
- f->file_size = td->total_file_size / td->nr_files;
- f->file_offset = td->start_offset;
+ if (td->directory && f->filetype == FIO_TYPE_FILE) {
+ sprintf(fname, "%s/%s", td->directory, f->file_name);
+ f->file_name = strdup(fname);
+ }
}
- fio_sem_init(&td->mutex, 0);
+ td->mutex = fio_sem_init(0);
- td->clat_stat[0].min_val = td->clat_stat[1].min_val = ULONG_MAX;
- td->slat_stat[0].min_val = td->slat_stat[1].min_val = ULONG_MAX;
- td->bw_stat[0].min_val = td->bw_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;
+ td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
- if (td->stonewall && td->thread_number > 1)
+ if ((td->stonewall || td->numjobs > 1) && prev_group_jobs) {
+ prev_group_jobs = 0;
groupid++;
+ }
td->groupid = groupid;
+ prev_group_jobs++;
if (setup_rate(td))
goto err;
if (td->write_lat_log) {
- setup_log(&td->slat_log);
- setup_log(&td->clat_log);
+ setup_log(&td->ts.slat_log);
+ setup_log(&td->ts.clat_log);
}
if (td->write_bw_log)
- setup_log(&td->bw_log);
+ setup_log(&td->ts.bw_log);
if (!td->name)
td->name = strdup(jobname);
- ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
-
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;
c3 = to_kmg(td->min_bs[DDIR_WRITE]);
c4 = to_kmg(td->max_bs[DDIR_WRITE]);
- fprintf(f_out, "%s: (g=%d): rw=%s, odir=%u, bs=%s-%s/%s-%s, rate=%u, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[ddir], td->odirect, c1, c2, c3, c4, td->rate, td->io_ops->name, td->iodepth);
+ fprintf(f_out, "%s: (g=%d): rw=%s, bs=%s-%s/%s-%s, ioengine=%s, iodepth=%u\n", td->name, td->groupid, ddir_str[td->td_ddir], c1, c2, c3, c4, td->io_ops->name, td->iodepth);
free(c1);
free(c2);
if (add_job(td_new, jobname, job_add_num))
goto err;
}
+
+ if (td->numjobs > 1) {
+ groupid++;
+ prev_group_jobs = 0;
+ }
+
return 0;
err:
put_job(td);
*/
int init_random_state(struct thread_data *td)
{
- unsigned long seeds[4];
- int fd, num_maps, blocks, i;
+ unsigned long seeds[5];
+ int fd, num_maps, blocks;
struct fio_file *f;
+ unsigned int i;
- if (td->io_ops->flags & FIO_CPUIO)
+ if (td->io_ops->flags & FIO_DISKLESSIO)
return 0;
fd = open("/dev/urandom", O_RDONLY);
if (fd == -1) {
- td_verror(td, errno);
+ td_verror(td, errno, "open");
return 1;
}
if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
- td_verror(td, EIO);
+ td_verror(td, EIO, "read");
close(fd);
return 1;
}
os_random_seed(seeds[1], &td->verify_state);
os_random_seed(seeds[2], &td->rwmix_state);
- if (td->sequential)
+ if (td->file_service_type == FIO_FSERVICE_RANDOM)
+ os_random_seed(seeds[3], &td->next_file_state);
+
+ if (!td_random(td))
return 0;
if (td->rand_repeatable)
- seeds[3] = FIO_RANDSEED;
+ seeds[4] = FIO_RANDSEED * td->thread_number;
if (!td->norandommap) {
for_each_file(td, f, i) {
- blocks = (f->file_size + td->rw_min_bs - 1) / td->rw_min_bs;
+ 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));
}
}
- os_random_seed(seeds[3], &td->random_state);
+ os_random_seed(seeds[4], &td->random_state);
return 0;
}
for (i = 0; i < strlen(line); i++) {
if (line[i] == ';')
return 1;
+ if (line[i] == '#')
+ return 1;
if (!isspace(line[i]) && !iscntrl(line[i]))
return 0;
}
return 1;
}
-static int str_rw_cb(void *data, const char *mem)
-{
- struct thread_data *td = data;
-
- if (!strncmp(mem, "read", 4) || !strncmp(mem, "0", 1)) {
- td->ddir = DDIR_READ;
- td->sequential = 1;
- return 0;
- } else if (!strncmp(mem, "randread", 8)) {
- td->ddir = DDIR_READ;
- td->sequential = 0;
- return 0;
- } else if (!strncmp(mem, "write", 5) || !strncmp(mem, "1", 1)) {
- td->ddir = DDIR_WRITE;
- td->sequential = 1;
- return 0;
- } else if (!strncmp(mem, "randwrite", 9)) {
- td->ddir = DDIR_WRITE;
- td->sequential = 0;
- return 0;
- } else if (!strncmp(mem, "rw", 2)) {
- td->ddir = DDIR_READ;
- td->iomix = 1;
- td->sequential = 1;
- return 0;
- } else if (!strncmp(mem, "randrw", 6)) {
- td->ddir = DDIR_READ;
- td->iomix = 1;
- td->sequential = 0;
- return 0;
- }
-
- log_err("fio: data direction: read, write, randread, randwrite, rw, randrw\n");
- return 1;
-}
-
-static int str_verify_cb(void *data, const char *mem)
-{
- struct thread_data *td = data;
-
- if (!strncmp(mem, "0", 1)) {
- td->verify = VERIFY_NONE;
- return 0;
- } else if (!strncmp(mem, "md5", 3) || !strncmp(mem, "1", 1)) {
- td->verify = VERIFY_MD5;
- return 0;
- } else if (!strncmp(mem, "crc32", 5)) {
- td->verify = VERIFY_CRC32;
- return 0;
- }
-
- log_err("fio: verify types: md5, crc32\n");
- return 1;
-}
-
/*
* 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 (!strncmp(mem, "malloc", 6)) {
- td->mem_type = MEM_MALLOC;
- return 0;
- } else if (!strncmp(mem, "mmaphuge", 8)) {
-#ifdef FIO_HAVE_HUGETLB
- /*
- * mmaphuge must be appended with the actual file
- */
- td->mmapfile = get_mmap_file(mem);
- if (!td->mmapfile) {
+ if (td->mem_type == MEM_MMAPHUGE || td->mem_type == MEM_MMAP) {
+ td->mmapfile = get_opt_postfix(mem);
+ if (td->mem_type == MEM_MMAPHUGE && !td->mmapfile) {
log_err("fio: mmaphuge:/path/to/file\n");
return 1;
}
-
- td->mem_type = MEM_MMAPHUGE;
- return 0;
-#else
- log_err("fio: mmaphuge not available\n");
- return 1;
-#endif
- } else if (!strncmp(mem, "mmap", 4)) {
- /*
- * Check if the user wants file backed memory. It's ok
- * if there's no file given, we'll just use anon mamp then.
- */
- td->mmapfile = get_mmap_file(mem);
- td->mem_type = MEM_MMAP;
- return 0;
- } else if (!strncmp(mem, "shmhuge", 7)) {
-#ifdef FIO_HAVE_HUGETLB
- td->mem_type = MEM_SHMHUGE;
- return 0;
-#else
- log_err("fio: shmhuge not available\n");
- return 1;
-#endif
- } else if (!strncmp(mem, "shm", 3)) {
- td->mem_type = MEM_SHM;
- return 0;
}
- log_err("fio: mem type: malloc, shm, shmhuge, mmap, mmaphuge\n");
- return 1;
-}
-
-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;
-
- log_err("fio: ioengine= libaio, posixaio, sync, mmap, sgio, splice, cpu, null\n");
- log_err("fio: or specify path to dynamic ioengine module\n");
- return 1;
+ return 0;
}
static int str_lockmem_cb(void fio_unused *data, unsigned long *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;
+}
+
+static int str_filename_cb(void *data, const char *input)
+{
+ struct thread_data *td = data;
+ char *fname, *str, *p;
+
+ p = str = strdup(input);
+
+ strip_blank_front(&str);
+ strip_blank_end(str);
+
+ if (!td->files_index)
+ td->nr_files = 0;
+
+ while ((fname = strsep(&str, ":")) != NULL) {
+ if (!strlen(fname))
+ break;
+ add_file(td, fname);
+ td->nr_files++;
+ }
+
+ free(p);
+ return 0;
+}
+
+static int str_directory_cb(void *data, const char fio_unused *str)
+{
+ struct thread_data *td = data;
+ struct stat sb;
+
+ if (lstat(td->directory, &sb) < 0) {
+ log_err("fio: %s is not a directory\n", td->directory);
+ td_verror(td, errno, "lstat");
+ return 1;
+ }
+ if (!S_ISDIR(sb.st_mode)) {
+ log_err("fio: %s is not a directory\n", td->directory);
+ return 1;
+ }
+
+ return 0;
+}
+
+static int str_opendir_cb(void *data, const char fio_unused *str)
+{
+ struct thread_data *td = data;
+
+ if (!td->files_index)
+ td->nr_files = 0;
+
+ return add_dir_files(td, td->opendir);
+}
+
/*
* This is our [ini] type file parser.
*/
static int parse_cmd_line(int argc, char *argv[])
{
struct thread_data *td = NULL;
- int c, ini_idx = 0, lidx, ret;
+ 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);
}
ret = parse_cmd_option(opt, val, options, td);
- if (ret) {
- log_err("fio: job dropped\n");
- put_job(td);
- td = NULL;
- }
+ if (ret)
+ dont_add_job = 1;
break;
}
default:
}
if (td) {
- ret = add_job(td, td->name ?: "fio", 0);
- if (ret)
+ if (dont_add_job)
put_job(td);
+ else {
+ ret = add_job(td, td->name ?: "fio", 0);
+ if (ret)
+ put_job(td);
+ }
}
while (optind < argc) {
projects / fio.git / blobdiff