X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=init.c;h=1bcd487941aee64e2e2107421968616e816e7436;hb=41ccd84597867a36289392e59634d9fd7dc4c397;hp=fae35f3c8260fd140e0852d31d2f7abe1248e88a;hpb=7313b48c3196b4750f4103e8622126039e2231c6;p=fio.git diff --git a/init.c b/init.c index fae35f3c..2a3fcee7 100644 --- a/init.c +++ b/init.c @@ -1,6 +1,5 @@ /* - * This file contains the ini and command liner parser. It will create - * and initialize the specified jobs. + * This file contains job initialization and setup functions. */ #include #include @@ -9,64 +8,135 @@ #include #include #include +#include #include #include #include #include #include "fio.h" +#include "parse.h" +#include "smalloc.h" +#include "filehash.h" -/* - * The default options - */ -#define DEF_BS (4096) -#define DEF_TIMEOUT (0) -#define DEF_RATE_CYCLE (1000) -#define DEF_ODIRECT (1) -#define DEF_IO_ENGINE (FIO_SYNCIO) -#define DEF_IO_ENGINE_NAME "sync" -#define DEF_SEQUENTIAL (1) -#define DEF_RAND_REPEAT (1) -#define DEF_OVERWRITE (1) -#define DEF_CREATE (1) -#define DEF_INVALIDATE (1) -#define DEF_SYNCIO (0) -#define DEF_RANDSEED (0xb1899bedUL) -#define DEF_BWAVGTIME (500) -#define DEF_CREATE_SER (1) -#define DEF_CREATE_FSYNC (1) -#define DEF_LOOPS (1) -#define DEF_VERIFY (0) -#define DEF_STONEWALL (0) -#define DEF_NUMJOBS (1) -#define DEF_USE_THREAD (0) -#define DEF_FILE_SIZE (1024 * 1024 * 1024UL) -#define DEF_ZONE_SIZE (0) -#define DEF_ZONE_SKIP (0) -#define DEF_RWMIX_CYCLE (500) -#define DEF_RWMIX_READ (50) -#define DEF_NICE (0) -#define DEF_NR_FILES (1) -#define DEF_UNLINK (0) - -static int def_timeout = DEF_TIMEOUT; - -static char fio_version_string[] = "fio 1.5"; +static char fio_version_string[] = "fio 1.20"; + +#define FIO_RANDSEED (0xb1899bedUL) static char **ini_file; static int max_jobs = MAX_JOBS; +static int dump_cmdline; struct thread_data def_thread; struct thread_data *threads = NULL; -int rate_quit = 0; -int write_lat_log = 0; -int write_bw_log = 0; int exitall_on_terminate = 0; int terse_output = 0; +int eta_print; unsigned long long mlock_size = 0; FILE *f_out = NULL; FILE *f_err = NULL; +char *job_section = NULL; + +int write_bw_log = 0; +int read_only = 0; + +static int def_timeout; +static int write_lat_log; + +static int prev_group_jobs; + +unsigned long fio_debug = 0; + +/* + * Command line options. These will contain the above, plus a few + * extra that only pertain to fio itself and not jobs. + */ +static struct option l_opts[FIO_NR_OPTIONS] = { + { + .name = "output", + .has_arg = required_argument, + .val = 'o', + }, + { + .name = "timeout", + .has_arg = required_argument, + .val = 't', + }, + { + .name = "latency-log", + .has_arg = required_argument, + .val = 'l', + }, + { + .name = "bandwidth-log", + .has_arg = required_argument, + .val = 'b', + }, + { + .name = "minimal", + .has_arg = optional_argument, + .val = 'm', + }, + { + .name = "version", + .has_arg = no_argument, + .val = 'v', + }, + { + .name = "help", + .has_arg = no_argument, + .val = 'h', + }, + { + .name = "cmdhelp", + .has_arg = optional_argument, + .val = 'c', + }, + { + .name = "showcmd", + .has_arg = no_argument, + .val = 's', + }, + { + .name = "readonly", + .has_arg = no_argument, + .val = 'r', + }, + { + .name = "eta", + .has_arg = required_argument, + .val = 'e', + }, + { + .name = "debug", + .has_arg = required_argument, + .val = 'd', + }, + { + .name = "section", + .has_arg = required_argument, + .val = 'x', + }, + { + .name = "alloc-size", + .has_arg = required_argument, + .val = 'a', + }, + { + .name = NULL, + }, +}; + +FILE *get_f_out() +{ + return f_out; +} + +FILE *get_f_err() +{ + return f_err; +} /* * Return a free job structure. @@ -82,7 +152,9 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) td = &threads[thread_number++]; *td = *parent; - td->name[0] = '\0'; + + dup_files(td, parent); + options_mem_dupe(td); td->thread_number = thread_number; return td; @@ -90,201 +162,229 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent) static void put_job(struct thread_data *td) { + if (td == &def_thread) + return; + + if (td->error) + log_info("fio: %s\n", td->verror); + memset(&threads[td->thread_number - 1], 0, sizeof(*td)); thread_number--; } +static int setup_rate(struct thread_data *td) +{ + unsigned long nr_reads_per_msec; + unsigned long long rate; + unsigned int bs; + + if (!td->o.rate && !td->o.rate_iops) + return 0; + + if (td_rw(td)) + bs = td->o.rw_min_bs; + else if (td_read(td)) + bs = td->o.min_bs[DDIR_READ]; + else + bs = td->o.min_bs[DDIR_WRITE]; + + if (td->o.rate) { + rate = td->o.rate; + nr_reads_per_msec = (rate * 1024 * 1000LL) / bs; + } else + nr_reads_per_msec = td->o.rate_iops * 1000UL; + + if (!nr_reads_per_msec) { + log_err("rate lower than supported\n"); + return -1; + } + + td->rate_usec_cycle = 1000000000ULL / nr_reads_per_msec; + td->rate_pending_usleep = 0; + return 0; +} + /* - * Adds a job to the list of things todo. Sanitizes the various options - * to make sure we don't have conflicts, and initializes various - * members of td. + * Lazy way of fixing up options that depend on each other. We could also + * define option callback handlers, but this is easier. */ -static int add_job(struct thread_data *td, const char *jobname, int job_add_num) +static int fixup_options(struct thread_data *td) { - char *ddir_str[] = { "read", "write", "randread", "randwrite", - "rw", NULL, "randrw" }; - struct stat sb; - int numjobs, ddir, i; - struct fio_file *f; + struct thread_options *o = &td->o; -#ifndef FIO_HAVE_LIBAIO - if (td->io_engine == FIO_LIBAIO) { - log_err("Linux libaio not available\n"); + if (read_only && td_write(td)) { + log_err("fio: job <%s> has write bit set, but fio is in" + " read-only mode\n", td->o.name); return 1; } -#endif -#ifndef FIO_HAVE_POSIXAIO - if (td->io_engine == FIO_POSIXAIO) { - log_err("posix aio not available\n"); - return 1; + + if (o->rwmix[DDIR_READ] + o->rwmix[DDIR_WRITE] > 100) + o->rwmix[DDIR_WRITE] = 100 - o->rwmix[DDIR_READ]; + + if (o->write_iolog_file && o->read_iolog_file) { + log_err("fio: read iolog overrides write_iolog\n"); + free(o->write_iolog_file); + o->write_iolog_file = NULL; } -#endif /* - * the def_thread is just for options, it's not a real job + * only really works for sequential io for now, and with 1 file */ - if (td == &def_thread) - return 0; + if (o->zone_size && td_random(td) && o->open_files == 1) + o->zone_size = 0; /* - * Set default io engine, if none set + * Reads can do overwrites, we always need to pre-create the file */ - if (!td->io_ops) { - td->io_ops = load_ioengine(td, DEF_IO_ENGINE_NAME); - if (!td->io_ops) { - log_err("default engine %s not there?\n", DEF_IO_ENGINE_NAME); - return 1; - } - } + if (td_read(td) || td_rw(td)) + o->overwrite = 1; + + if (!o->min_bs[DDIR_READ]) + o->min_bs[DDIR_READ] = o->bs[DDIR_READ]; + if (!o->max_bs[DDIR_READ]) + o->max_bs[DDIR_READ] = o->bs[DDIR_READ]; + if (!o->min_bs[DDIR_WRITE]) + o->min_bs[DDIR_WRITE] = o->bs[DDIR_WRITE]; + if (!o->max_bs[DDIR_WRITE]) + o->max_bs[DDIR_WRITE] = o->bs[DDIR_WRITE]; + + o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]); + + if (!o->file_size_high) + o->file_size_high = o->file_size_low; - if (td->io_ops->flags & FIO_SYNCIO) - td->iodepth = 1; - else { - if (!td->iodepth) - td->iodepth = 1; + if (o->norandommap && o->verify != VERIFY_NONE) { + log_err("fio: norandommap given, verify disabled\n"); + o->verify = VERIFY_NONE; } + if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO)) + log_err("fio: bs_unaligned may not work with raw io\n"); /* - * only really works for sequential io for now, and with 1 file + * thinktime_spin must be less than thinktime */ - if (td->zone_size && !td->sequential && td->nr_files == 1) - td->zone_size = 0; + if (o->thinktime_spin > o->thinktime) + o->thinktime_spin = o->thinktime; /* - * Reads can do overwrites, we always need to pre-create the file + * The low water mark cannot be bigger than the iodepth */ - if (td_read(td) || td_rw(td)) - td->overwrite = 1; - - 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; + if (o->iodepth_low > o->iodepth || !o->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)) + o->iodepth_low = 1; + else + o->iodepth_low = o->iodepth; } - if (td->odirect) - td->io_ops->flags |= FIO_RAWIO; - - if (td->filetype == FIO_TYPE_FILE) { - char tmp[PATH_MAX]; - int len = 0; - int i; - - if (td->directory && td->directory[0] != '\0') - sprintf(tmp, "%s/", td->directory); + /* + * If batch number isn't set, default to the same as iodepth + */ + if (o->iodepth_batch > o->iodepth || !o->iodepth_batch) + o->iodepth_batch = o->iodepth; - td->files = malloc(sizeof(struct fio_file) * td->nr_files); + if (o->nr_files > td->files_index) + o->nr_files = td->files_index; - for_each_file(td, f, i) { - memset(f, 0, sizeof(*f)); - f->fd = -1; - f->fileno = i; + if (o->open_files > o->nr_files || !o->open_files) + o->open_files = o->nr_files; - sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i); - f->file_name = strdup(tmp); - } - } 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); + if ((o->rate && o->rate_iops) || (o->ratemin && o->rate_iops_min)) { + log_err("fio: rate and rate_iops are mutually exclusive\n"); + return 1; + } + if ((o->rate < o->ratemin) || (o->rate_iops < o->rate_iops_min)) { + log_err("fio: minimum rate exceeds rate\n"); + return 1; } - for_each_file(td, f, i) { - f->file_size = td->total_file_size / td->nr_files; - f->file_offset = td->start_offset; + if (!o->timeout && o->time_based) { + log_err("fio: time_based requires a runtime/timeout setting\n"); + o->time_based = 0; } - - fio_sem_init(&td->mutex, 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; + if (o->fill_device && !o->size) + o->size = ULONG_LONG_MAX; - if (td->min_bs == -1U) - td->min_bs = td->bs; - if (td->max_bs == -1U) - td->max_bs = td->bs; - if (td_read(td) && !td_rw(td)) - td->verify = 0; + if (td_rw(td) && td->o.verify != VERIFY_NONE) + log_info("fio: mixed read/write workload with verify. May not " + "work as expected, unless you pre-populated the file\n"); - if (td->stonewall && td->thread_number > 1) - groupid++; + if (td->o.verify != VERIFY_NONE) + td->o.refill_buffers = 1; - td->groupid = groupid; + return 0; +} - if (setup_rate(td)) - goto err; +/* + * This function leaks the buffer + */ +static char *to_kmg(unsigned int val) +{ + char *buf = malloc(32); + char post[] = { 0, 'K', 'M', 'G', 'P', 'E', 0 }; + char *p = post; - if (write_lat_log) { - setup_log(&td->slat_log); - setup_log(&td->clat_log); - } - if (write_bw_log) - setup_log(&td->bw_log); + do { + if (val & 1023) + break; - if (td->name[0] == '\0') - snprintf(td->name, sizeof(td->name)-1, "client%d", td->thread_number); + val >>= 10; + p++; + } while (*p); - ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2); + snprintf(buf, 31, "%u%c", val, *p); + return buf; +} - if (!terse_output) { - if (!job_add_num) { - if (td->io_ops->flags & FIO_CPUIO) - fprintf(f_out, "%s: ioengine=cpu, cpuload=%u, cpucycle=%u\n", td->name, td->cpuload, td->cpucycle); - else - fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs, td->max_bs, td->rate, td->io_ops->name, td->iodepth); - } else if (job_add_num == 1) - fprintf(f_out, "...\n"); - } +/* External engines are specified by "external:name.o") */ +static const char *get_engine_name(const char *str) +{ + char *p = strstr(str, ":"); - /* - * recurse add identical jobs, clear numjobs and stonewall options - * as they don't apply to sub-jobs - */ - numjobs = td->numjobs; - while (--numjobs) { - struct thread_data *td_new = get_new_job(0, td); + if (!p) + return str; - if (!td_new) - goto err; + p++; + strip_blank_front(&p); + strip_blank_end(p); + return p; +} - td_new->numjobs = 1; - td_new->stonewall = 0; - job_add_num = numjobs - 1; +static int exists_and_not_file(const char *filename) +{ + struct stat sb; - if (add_job(td_new, jobname, job_add_num)) - goto err; - } - return 0; -err: - put_job(td); - return -1; + if (lstat(filename, &sb) == -1) + return 0; + + if (S_ISREG(sb.st_mode)) + return 0; + + return 1; } /* * Initialize the various random states we need (random io, block size ranges, * read/write mix, etc). */ -int init_random_state(struct thread_data *td) +static int init_random_state(struct thread_data *td) { - unsigned long seeds[4]; - int fd, num_maps, blocks, i; - struct fio_file *f; + unsigned long seeds[6]; + int fd; 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; } @@ -295,392 +395,289 @@ int init_random_state(struct thread_data *td) os_random_seed(seeds[1], &td->verify_state); os_random_seed(seeds[2], &td->rwmix_state); - if (td->sequential) - return 0; + if (td->o.file_service_type == FIO_FSERVICE_RANDOM) + os_random_seed(seeds[3], &td->next_file_state); - if (td->rand_repeatable) - seeds[3] = DEF_RANDSEED; + os_random_seed(seeds[5], &td->file_size_state); - for_each_file(td, f, i) { - blocks = (f->file_size + td->min_bs - 1) / td->min_bs; - num_maps = blocks / BLOCKS_PER_MAP; - f->file_map = malloc(num_maps * sizeof(long)); - f->num_maps = num_maps; - memset(f->file_map, 0, num_maps * sizeof(long)); - } + if (!td_random(td)) + return 0; + + if (td->o.rand_repeatable) + seeds[4] = FIO_RANDSEED * td->thread_number; - os_random_seed(seeds[3], &td->random_state); + os_random_seed(seeds[4], &td->random_state); return 0; } -static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu) +/* + * Adds a job to the list of things todo. Sanitizes the various options + * to make sure we don't have conflicts, and initializes various + * members of td. + */ +static int add_job(struct thread_data *td, const char *jobname, int job_add_num) { -#ifdef FIO_HAVE_CPU_AFFINITY + const char *ddir_str[] = { NULL, "read", "write", "rw", NULL, + "randread", "randwrite", "randrw" }; unsigned int i; + const char *engine; + char fname[PATH_MAX]; + int numjobs, file_alloced; - CPU_ZERO(&cpumask); - - for (i = 0; i < sizeof(int) * 8; i++) { - if ((1 << i) & cpu) - CPU_SET(i, &cpumask); - } -#endif -} + /* + * the def_thread is just for options, it's not a real job + */ + if (td == &def_thread) + return 0; -static unsigned long get_mult_time(char c) -{ - switch (c) { - case 'm': - case 'M': - return 60; - case 'h': - case 'H': - return 60 * 60; - case 'd': - case 'D': - return 24 * 60 * 60; - default: - return 1; + /* + * if we are just dumping the output command line, don't add the job + */ + if (dump_cmdline) { + put_job(td); + return 0; } -} -static unsigned long get_mult_bytes(char c) -{ - switch (c) { - case 'k': - case 'K': - return 1024; - case 'm': - case 'M': - return 1024 * 1024; - case 'g': - case 'G': - return 1024 * 1024 * 1024; - default: - return 1; + engine = get_engine_name(td->o.ioengine); + td->io_ops = load_ioengine(td, engine); + if (!td->io_ops) { + log_err("fio: failed to load engine %s\n", engine); + goto err; } -} - -/* - * convert string after '=' into decimal value, noting any size suffix - */ -static int str_to_decimal(char *p, unsigned long long *val, int kilo) -{ - char *str; - int len; - - str = strchr(p, '='); - if (!str) - return 1; - str++; - len = strlen(str); - - *val = strtoul(str, NULL, 10); - if (*val == ULONG_MAX && errno == ERANGE) - return 1; - - if (kilo) - *val *= get_mult_bytes(str[len - 1]); + if (td->o.use_thread) + nr_thread++; else - *val *= get_mult_time(str[len - 1]); - return 0; -} + nr_process++; -static int check_str_bytes(char *p, char *name, unsigned long long *val) -{ - if (strncmp(p, name, strlen(name) - 1)) - return 1; + if (td->o.odirect) + td->io_ops->flags |= FIO_RAWIO; - return str_to_decimal(p, val, 1); -} + file_alloced = 0; + if (!td->o.filename && !td->files_index && !td->o.read_iolog_file) { + file_alloced = 1; + + if (td->o.nr_files == 1 && exists_and_not_file(jobname)) + add_file(td, jobname); + else { + for (i = 0; i < td->o.nr_files; i++) { + sprintf(fname, "%s.%d.%d", jobname, + td->thread_number, i); + add_file(td, fname); + } + } + } -static int check_str_time(char *p, char *name, unsigned long long *val) -{ - if (strncmp(p, name, strlen(name) - 1)) - return 1; + if (fixup_options(td)) + goto err; - return str_to_decimal(p, val, 0); -} + if (td->io_ops->flags & FIO_DISKLESSIO) { + struct fio_file *f; -static void strip_blank_front(char **p) -{ - char *s = *p; + for_each_file(td, f, i) + f->real_file_size = -1ULL; + } - while (isspace(*s)) - s++; -} + td->mutex = fio_mutex_init(0); -static void strip_blank_end(char *p) -{ - char *s = p + strlen(p) - 1; + 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; + td->ddir_nr = td->o.ddir_nr; - while (isspace(*s) || iscntrl(*s)) - s--; + if ((td->o.stonewall || td->o.numjobs > 1 || td->o.new_group) + && prev_group_jobs) { + prev_group_jobs = 0; + groupid++; + } - *(s + 1) = '\0'; -} + td->groupid = groupid; + prev_group_jobs++; -typedef int (str_cb_fn)(struct thread_data *, char *); + if (init_random_state(td)) + goto err; -static int check_str(char *p, char *name, str_cb_fn *cb, struct thread_data *td) -{ - char *s; + if (setup_rate(td)) + goto err; - if (strncmp(p, name, strlen(name))) - return 1; + if (td->o.write_lat_log) { + setup_log(&td->ts.slat_log); + setup_log(&td->ts.clat_log); + } + if (td->o.write_bw_log) + setup_log(&td->ts.bw_log); - s = strstr(p, name); - if (!s) - return 1; + if (!td->o.name) + td->o.name = strdup(jobname); - s = strchr(s, '='); - if (!s) - return 1; + if (!terse_output) { + if (!job_add_num) { + if (!strcmp(td->io_ops->name, "cpuio")) { + log_info("%s: ioengine=cpu, cpuload=%u," + " cpucycle=%u\n", td->o.name, + td->o.cpuload, + td->o.cpucycle); + } else { + char *c1, *c2, *c3, *c4; + + c1 = to_kmg(td->o.min_bs[DDIR_READ]); + c2 = to_kmg(td->o.max_bs[DDIR_READ]); + c3 = to_kmg(td->o.min_bs[DDIR_WRITE]); + c4 = to_kmg(td->o.max_bs[DDIR_WRITE]); + + log_info("%s: (g=%d): rw=%s, bs=%s-%s/%s-%s," + " ioengine=%s, iodepth=%u\n", + td->o.name, td->groupid, + ddir_str[td->o.td_ddir], + c1, c2, c3, c4, + td->io_ops->name, + td->o.iodepth); + + free(c1); + free(c2); + free(c3); + free(c4); + } + } else if (job_add_num == 1) + log_info("...\n"); + } - s++; - strip_blank_front(&s); - return cb(td, s); -} + /* + * recurse add identical jobs, clear numjobs and stonewall options + * as they don't apply to sub-jobs + */ + numjobs = td->o.numjobs; + while (--numjobs) { + struct thread_data *td_new = get_new_job(0, td); -static int check_strstore(char *p, char *name, char *dest) -{ - char *s; + if (!td_new) + goto err; - if (strncmp(p, name, strlen(name))) - return 1; + td_new->o.numjobs = 1; + td_new->o.stonewall = 0; + td_new->o.new_group = 0; - s = strstr(p, name); - if (!s) - return 1; + if (file_alloced) { + td_new->o.filename = NULL; + td_new->files_index = 0; + td_new->files = NULL; + } - s = strchr(p, '='); - if (!s) - return 1; + job_add_num = numjobs - 1; - s++; - strip_blank_front(&s); + if (add_job(td_new, jobname, job_add_num)) + goto err; + } - strcpy(dest, s); return 0; +err: + put_job(td); + return -1; } -static int __check_range_bytes(char *str, unsigned long *val) +static int skip_this_section(const char *name) { - char suffix; - - if (sscanf(str, "%lu%c", val, &suffix) == 2) { - *val *= get_mult_bytes(suffix); + if (!job_section) return 0; - } - - if (sscanf(str, "%lu", val) == 1) + if (!strncmp(name, "global", 6)) return 0; - return 1; + return strncmp(job_section, name, strlen(job_section)); } -static int check_range_bytes(char *p, char *name, unsigned long *s, - unsigned long *e) +static int is_empty_or_comment(char *line) { - char option[128]; - char *str, *p1, *p2; + unsigned int i; - if (strncmp(p, name, strlen(name))) - return 1; + 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; + } - strcpy(option, p); - p = option; + return 1; +} - str = strstr(p, name); - if (!str) - return 1; +/* + * This is our [ini] type file parser. + */ +static int parse_jobs_ini(char *file, int stonewall_flag) +{ + unsigned int global; + struct thread_data *td; + char *string, *name; + FILE *f; + char *p; + int ret = 0, stonewall; + int first_sect = 1; + int skip_fgets = 0; + int inside_skip = 0; - p += strlen(name); + if (!strcmp(file, "-")) + f = stdin; + else + f = fopen(file, "r"); - str = strchr(p, '='); - if (!str) + if (!f) { + perror("fopen job file"); return 1; + } - /* - * 'p' now holds whatever is after the '=' sign - */ - p1 = str + 1; + string = malloc(4096); /* - * terminate p1 at the '-' sign + * it's really 256 + small bit, 280 should suffice */ - p = strchr(p1, '-'); - if (!p) - return 1; + name = malloc(280); + memset(name, 0, 280); - p2 = p + 1; - *p = '\0'; + stonewall = stonewall_flag; + do { + /* + * if skip_fgets is set, we already have loaded a line we + * haven't handled. + */ + if (!skip_fgets) { + p = fgets(string, 4095, f); + if (!p) + break; + } - if (!__check_range_bytes(p1, s) && !__check_range_bytes(p2, e)) - return 0; + skip_fgets = 0; + strip_blank_front(&p); + strip_blank_end(p); - return 1; -} - -static int check_int(char *p, char *name, unsigned int *val) -{ - char *str; - - if (strncmp(p, name, strlen(name))) - return 1; - - str = strstr(p, name); - if (!str) - return 1; - - str = strchr(p, '='); - if (!str) - return 1; - - str++; - - if (sscanf(str, "%u", val) == 1) - return 0; - - return 1; -} - -static int check_strset(char *p, char *name) -{ - return strncmp(p, name, strlen(name)); -} - -static int is_empty_or_comment(char *line) -{ - unsigned int i; - - for (i = 0; i < strlen(line); i++) { - if (line[i] == ';') - return 1; - if (!isspace(line[i]) && !iscntrl(line[i])) - return 0; - } - - return 1; -} - -static int str_rw_cb(struct thread_data *td, char *mem) -{ - 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 = 0; - td->iomix = 1; - td->sequential = 1; - return 0; - } else if (!strncmp(mem, "randrw", 6)) { - td->ddir = 0; - 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(struct thread_data *td, char *mem) -{ - 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; -} - -static int str_mem_cb(struct thread_data *td, char *mem) -{ - if (!strncmp(mem, "malloc", 6)) { - td->mem_type = MEM_MALLOC; - return 0; - } else if (!strncmp(mem, "shm", 3)) { - td->mem_type = MEM_SHM; - return 0; - } else if (!strncmp(mem, "mmap", 4)) { - td->mem_type = MEM_MMAP; - return 0; - } - - log_err("fio: mem type: malloc, shm, mmap\n"); - return 1; -} - -static int str_ioengine_cb(struct thread_data *td, char *str) -{ - td->io_ops = load_ioengine(td, str); - if (td->io_ops) - return 0; - - log_err("fio: ioengine: { linuxaio, aio, libaio }, posixaio, sync, mmap, sgio, splice, cpu\n"); - return 1; -} - -/* - * This is our [ini] type file parser. - */ -int parse_jobs_ini(char *file, int stonewall_flag) -{ - unsigned int prioclass, prio, cpu, global, il; - unsigned long long ull; - unsigned long ul1, ul2; - struct thread_data *td; - char *string, *name, *tmpbuf; - fpos_t off; - FILE *f; - char *p; - int ret = 0, stonewall; - - f = fopen(file, "r"); - if (!f) { - perror("fopen job file"); - return 1; - } - - string = malloc(4096); - name = malloc(256); - tmpbuf = malloc(4096); - - stonewall = stonewall_flag; - while ((p = fgets(string, 4096, f)) != NULL) { - if (ret) - break; if (is_empty_or_comment(p)) continue; - if (sscanf(p, "[%s]", name) != 1) + if (sscanf(p, "[%255s]", name) != 1) { + if (inside_skip) + continue; + log_err("fio: option <%s> outside of [] job section\n", + p); + break; + } + + if (skip_this_section(name)) { + inside_skip = 1; continue; + } else + inside_skip = 0; global = !strncmp(name, "global", 6); name[strlen(name) - 1] = '\0'; + if (dump_cmdline) { + if (first_sect) + log_info("fio "); + if (!global) + log_info("--name=%s ", name); + first_sect = 0; + } + td = get_new_job(global, &def_thread); if (!td) { ret = 1; @@ -691,320 +688,52 @@ int parse_jobs_ini(char *file, int stonewall_flag) * Seperate multiple job files by a stonewall */ if (!global && stonewall) { - td->stonewall = stonewall; + td->o.stonewall = stonewall; stonewall = 0; } - fgetpos(f, &off); while ((p = fgets(string, 4096, f)) != NULL) { if (is_empty_or_comment(p)) continue; - if (strstr(p, "[")) - break; + strip_blank_front(&p); - strip_blank_end(p); - if (!check_int(p, "prio", &prio)) { -#ifndef FIO_HAVE_IOPRIO - log_err("io priorities not available\n"); - ret = 1; - break; -#endif - td->ioprio |= prio; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "prioclass", &prioclass)) { -#ifndef FIO_HAVE_IOPRIO - log_err("io priorities not available\n"); - ret = 1; - break; -#else - td->ioprio |= prioclass << IOPRIO_CLASS_SHIFT; - fgetpos(f, &off); - continue; -#endif - } - if (!check_int(p, "direct", &il)) { - td->odirect = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "rand_repeatable", &il)) { - td->rand_repeatable = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "rate", &td->rate)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "ratemin", &td->ratemin)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "ratecycle", &td->ratecycle)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "cpuload", &td->cpuload)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "cpuchunks", &td->cpucycle)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "thinktime", &td->thinktime)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "cpumask", &cpu)) { -#ifndef FIO_HAVE_CPU_AFFINITY - log_err("cpu affinity not available\n"); - ret = 1; - break; -#endif - fill_cpu_mask(td->cpumask, cpu); - fgetpos(f, &off); - continue; - } - if (!check_int(p, "fsync", &td->fsync_blocks)) { - fgetpos(f, &off); - td->end_fsync = 1; - continue; - } - if (!check_int(p, "startdelay", &td->start_delay)) { - fgetpos(f, &off); - continue; - } - if (!check_str_time(p, "timeout", &ull)) { - td->timeout = ull; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "invalidate", &il)) { - td->invalidate_cache = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "iodepth", &td->iodepth)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "sync", &il)) { - td->sync_io = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "bwavgtime", &td->bw_avg_time)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "create_serialize", &il)) { - td->create_serialize = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "create_fsync", &il)) { - td->create_fsync = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "end_fsync", &il)) { - td->end_fsync = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "loops", &td->loops)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "numjobs", &td->numjobs)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "overwrite", &il)) { - td->overwrite = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "rwmixcycle", &td->rwmixcycle)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "rwmixread", &il)) { - if (il > 100) - il = 100; - td->rwmixread = il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "rwmixwrite", &il)) { - if (il > 100) - il = 100; - td->rwmixread = 100 - il; - fgetpos(f, &off); - continue; - } - if (!check_int(p, "nice", &td->nice)) { - fgetpos(f, &off); - continue; - } - if (!check_int(p, "nrfiles", &td->nr_files)) { - fgetpos(f, &off); - continue; - } - if (!check_range_bytes(p, "bsrange", &ul1, &ul2)) { - if (ul1 > ul2) { - td->max_bs = ul1; - td->min_bs = ul2; - } else { - td->max_bs = ul2; - td->min_bs = ul1; - } - fgetpos(f, &off); - continue; - } - if (!check_str_bytes(p, "bs", &ull)) { - td->bs = ull; - fgetpos(f, &off); - continue; - } - if (!check_str_bytes(p, "size", &td->total_file_size)) { - fgetpos(f, &off); - continue; - } - if (!check_str_bytes(p, "offset", &td->start_offset)) { - fgetpos(f, &off); - continue; - } - if (!check_str_bytes(p, "zonesize", &td->zone_size)) { - fgetpos(f, &off); - continue; - } - if (!check_str_bytes(p, "zoneskip", &td->zone_skip)) { - fgetpos(f, &off); - continue; - } - if (!check_str_bytes(p, "lockmem", &mlock_size)) { - fgetpos(f, &off); - continue; - } - if (!check_strstore(p, "directory", tmpbuf)) { - td->directory = strdup(tmpbuf); - fgetpos(f, &off); - continue; - } - if (!check_strstore(p, "name", tmpbuf)) { - snprintf(td->name, sizeof(td->name)-1, "%s%d", tmpbuf, td->thread_number); - fgetpos(f, &off); - continue; - } - if (!check_str(p, "mem", str_mem_cb, td)) { - fgetpos(f, &off); - continue; - } - if (!check_str(p, "verify", str_verify_cb, td)) { - fgetpos(f, &off); - continue; - } - if (!check_str(p, "rw", str_rw_cb, td)) { - fgetpos(f, &off); - continue; - } - if (!check_str(p, "ioengine", str_ioengine_cb, td)) { - fgetpos(f, &off); - continue; - } - if (!check_strset(p, "create")) { - td->create_file = 1; - fgetpos(f, &off); - continue; - } - if (!check_strset(p, "exitall")) { - exitall_on_terminate = 1; - fgetpos(f, &off); - continue; - } - if (!check_strset(p, "stonewall")) { - td->stonewall = 1; - fgetpos(f, &off); - continue; - } - if (!check_strset(p, "thread")) { - td->use_thread = 1; - fgetpos(f, &off); - continue; - } - if (!check_strset(p, "unlink")) { - td->unlink = 1; - fgetpos(f, &off); - continue; - } - if (!check_strstore(p, "iolog", tmpbuf)) { - if (td->write_iolog) { - log_err("fio: read iolog overrides given write_iolog\n"); - free(td->iolog_file); - td->write_iolog = 0; - } - td->iolog_file = strdup(tmpbuf); - td->read_iolog = 1; - fgetpos(f, &off); - continue; - } - if (!check_strstore(p, "write_iolog", tmpbuf)) { - if (!td->read_iolog) { - td->iolog_file = strdup(tmpbuf); - td->write_iolog = 1; - } else - log_err("fio: read iolog overrides given write_iolog\n"); - fgetpos(f, &off); - continue; - } - if (!check_strstore(p, "exec_prerun", tmpbuf)) { - td->exec_prerun = strdup(tmpbuf); - fgetpos(f, &off); - continue; - } - if (!check_strstore(p, "exec_postrun", tmpbuf)) { - td->exec_postrun = strdup(tmpbuf); - fgetpos(f, &off); - continue; - } - if (!check_strstore(p, "ioscheduler", tmpbuf)) { -#ifndef FIO_HAVE_IOSCHED_SWITCH - log_err("io scheduler switching not available\n"); - ret = 1; + /* + * new section, break out and make sure we don't + * fgets() a new line at the top. + */ + if (p[0] == '[') { + skip_fgets = 1; break; -#else - td->ioscheduler = strdup(tmpbuf); - fgetpos(f, &off); - continue; -#endif } + strip_blank_end(p); + /* * Don't break here, continue parsing options so we * dump all the bad ones. Makes trial/error fixups * easier on the user. */ - printf("Client%d: bad option %s\n",td->thread_number,p); - ret = 1; + ret |= fio_option_parse(td, p); + if (!ret && dump_cmdline) + log_info("--%s ", p); } - if (!ret) { - fsetpos(f, &off); + if (!ret) ret = add_job(td, name, 0); + else { + log_err("fio: job %s dropped\n", name); + put_job(td); } - if (ret) - break; - } + } while (!ret); + + if (dump_cmdline) + log_info("\n"); free(string); free(name); - free(tmpbuf); - fclose(f); + if (f != stdin) + fclose(f); return ret; } @@ -1012,113 +741,18 @@ static int fill_def_thread(void) { memset(&def_thread, 0, sizeof(def_thread)); - if (fio_getaffinity(getpid(), &def_thread.cpumask) == -1) { - perror("sched_getaffinity"); - return 1; - } + fio_getaffinity(getpid(), &def_thread.o.cpumask); /* - * fill globals + * fill default options */ - def_thread.ddir = DDIR_READ; - def_thread.iomix = 0; - def_thread.bs = DEF_BS; - def_thread.min_bs = -1; - def_thread.max_bs = -1; - def_thread.odirect = DEF_ODIRECT; - def_thread.ratecycle = DEF_RATE_CYCLE; - def_thread.sequential = DEF_SEQUENTIAL; - def_thread.timeout = def_timeout; - def_thread.create_file = DEF_CREATE; - def_thread.overwrite = DEF_OVERWRITE; - def_thread.invalidate_cache = DEF_INVALIDATE; - def_thread.sync_io = DEF_SYNCIO; - def_thread.mem_type = MEM_MALLOC; - def_thread.bw_avg_time = DEF_BWAVGTIME; - def_thread.create_serialize = DEF_CREATE_SER; - def_thread.create_fsync = DEF_CREATE_FSYNC; - def_thread.loops = DEF_LOOPS; - def_thread.verify = DEF_VERIFY; - def_thread.stonewall = DEF_STONEWALL; - def_thread.numjobs = DEF_NUMJOBS; - def_thread.use_thread = DEF_USE_THREAD; - def_thread.rwmixcycle = DEF_RWMIX_CYCLE; - def_thread.rwmixread = DEF_RWMIX_READ; - def_thread.nice = DEF_NICE; - def_thread.rand_repeatable = DEF_RAND_REPEAT; - def_thread.nr_files = DEF_NR_FILES; - def_thread.unlink = DEF_UNLINK; -#ifdef FIO_HAVE_DISK_UTIL - def_thread.do_disk_util = 1; -#endif - - return 0; -} - -static void usage(void) -{ - printf("%s\n", fio_version_string); - printf("\t-o Write output to file\n"); - printf("\t-t Runtime in seconds\n"); - printf("\t-l Generate per-job latency logs\n"); - printf("\t-w Generate per-job bandwidth logs\n"); - printf("\t-m Minimal (terse) output\n"); - printf("\t-v Print version info and exit\n"); -} - -static int parse_cmd_line(int argc, char *argv[]) -{ - int c, idx = 1, ini_idx = 0; + fio_fill_default_options(&def_thread); - while ((c = getopt(argc, argv, "t:o:lwvhm")) != EOF) { - switch (c) { - case 't': - def_timeout = atoi(optarg); - idx = optind; - break; - case 'l': - write_lat_log = 1; - idx = optind; - break; - case 'w': - write_bw_log = 1; - idx = optind; - break; - case 'o': - f_out = fopen(optarg, "w+"); - if (!f_out) { - perror("fopen output"); - exit(1); - } - f_err = f_out; - idx = optind; - break; - case 'm': - terse_output = 1; - idx = optind; - break; - case 'h': - usage(); - exit(0); - case 'v': - printf("%s\n", fio_version_string); - exit(0); - } - } + def_thread.o.timeout = def_timeout; + def_thread.o.write_bw_log = write_bw_log; + def_thread.o.write_lat_log = write_lat_log; - while (idx < argc) { - ini_idx++; - ini_file = realloc(ini_file, ini_idx * sizeof(char *)); - ini_file[ini_idx - 1] = strdup(argv[idx]); - idx++; - } - - if (!f_out) { - f_out = stdout; - f_err = stderr; - } - - return ini_idx; + return 0; } static void free_shm(void) @@ -1130,15 +764,20 @@ static void free_shm(void) threads = NULL; shmctl(shm_id, IPC_RMID, &sbuf); } + + scleanup(); } /* * The thread area is shared between the main process and the job * threads/processes. So setup a shared memory segment that will hold - * all the job info. + * all the job info. We use the end of the region for keeping track of + * open files across jobs, for file sharing. */ static int setup_thread_area(void) { + void *hash; + /* * 1024 is too much on some machines, scale max_jobs if * we get a failure that looks like too large a shm segment @@ -1146,6 +785,8 @@ static int setup_thread_area(void) do { size_t size = max_jobs * sizeof(struct thread_data); + size += file_hash_size; + shm_id = shmget(0, size, IPC_CREAT | 0600); if (shm_id != -1) break; @@ -1166,25 +807,237 @@ static int setup_thread_area(void) return 1; } + memset(threads, 0, max_jobs * sizeof(struct thread_data)); + hash = (void *) threads + max_jobs * sizeof(struct thread_data); + file_hash_init(hash); atexit(free_shm); return 0; } +static void usage(const char *name) +{ + printf("%s\n", fio_version_string); + printf("%s [options] [job options] \n", name); + printf("\t--debug=options\tEnable debug logging\n"); + printf("\t--output\tWrite output to file\n"); + printf("\t--timeout\tRuntime in seconds\n"); + printf("\t--latency-log\tGenerate per-job latency logs\n"); + printf("\t--bandwidth-log\tGenerate per-job bandwidth logs\n"); + printf("\t--minimal\tMinimal (terse) output\n"); + printf("\t--version\tPrint version info and exit\n"); + printf("\t--help\t\tPrint this page\n"); + printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of" + " them\n"); + printf("\t--showcmd\tTurn a job file into command line options\n"); + printf("\t--eta=when\tWhen ETA estimate should be printed\n"); + printf("\t \tMay be \"always\", \"never\" or \"auto\"\n"); + printf("\t--readonly\tTurn on safety read-only checks, preventing" + " writes\n"); + printf("\t--section=name\tOnly run specified section in job file\n"); + printf("\t--alloc-size=kb\tSet smalloc pool to this size in kb" + " (def 1024)\n"); +} + +#ifdef FIO_INC_DEBUG +struct debug_level debug_levels[] = { + { .name = "process", .shift = FD_PROCESS, }, + { .name = "file", .shift = FD_FILE, }, + { .name = "io", .shift = FD_IO, }, + { .name = "mem", .shift = FD_MEM, }, + { .name = "blktrace", .shift = FD_BLKTRACE }, + { .name = "verify", .shift = FD_VERIFY }, + { .name = "random", .shift = FD_RANDOM }, + { .name = "parse", .shift = FD_PARSE }, + { .name = "diskutil", .shift = FD_DISKUTIL }, + { }, +}; + +static int set_debug(const char *string) +{ + struct debug_level *dl; + char *p = (char *) string; + char *opt; + int i; + + if (!strcmp(string, "?") || !strcmp(string, "help")) { + int i; + + log_info("fio: dumping debug options:"); + for (i = 0; debug_levels[i].name; i++) { + dl = &debug_levels[i]; + log_info("%s,", dl->name); + } + log_info("all\n"); + return 1; + } else if (!strcmp(string, "all")) { + fio_debug = ~0UL; + return 0; + } + + while ((opt = strsep(&p, ",")) != NULL) { + int found = 0; + + for (i = 0; debug_levels[i].name; i++) { + dl = &debug_levels[i]; + if (!strncmp(opt, dl->name, strlen(opt))) { + log_info("fio: set debug option %s\n", opt); + found = 1; + fio_debug |= (1UL << dl->shift); + break; + } + } + + if (!found) + log_err("fio: debug mask %s not found\n", opt); + } + return 0; +} +#else +static void set_debug(const char *string) +{ + log_err("fio: debug tracing not included in build\n"); + return 1; +} +#endif + +static int parse_cmd_line(int argc, char *argv[]) +{ + struct thread_data *td = NULL; + int c, ini_idx = 0, lidx, ret = 0, do_exit = 0, exit_val = 0; + + while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) { + switch (c) { + case 'a': + smalloc_pool_size = atoi(optarg); + break; + case 't': + def_timeout = atoi(optarg); + break; + case 'l': + write_lat_log = 1; + break; + case 'w': + write_bw_log = 1; + break; + case 'o': + f_out = fopen(optarg, "w+"); + if (!f_out) { + perror("fopen output"); + exit(1); + } + f_err = f_out; + break; + case 'm': + terse_output = 1; + break; + case 'h': + usage(argv[0]); + exit(0); + case 'c': + exit(fio_show_option_help(optarg)); + case 's': + dump_cmdline = 1; + break; + case 'r': + read_only = 1; + break; + case 'v': + printf("%s\n", fio_version_string); + exit(0); + case 'e': + if (!strcmp("always", optarg)) + eta_print = FIO_ETA_ALWAYS; + else if (!strcmp("never", optarg)) + eta_print = FIO_ETA_NEVER; + break; + case 'd': + if (set_debug(optarg)) + do_exit++; + break; + case 'x': + if (!strcmp(optarg, "global")) { + log_err("fio: can't use global as only " + "section\n"); + do_exit++; + exit_val = 1; + break; + } + if (job_section) + free(job_section); + job_section = strdup(optarg); + break; + case FIO_GETOPT_JOB: { + const char *opt = l_opts[lidx].name; + char *val = optarg; + + if (!strncmp(opt, "name", 4) && td) { + ret = add_job(td, td->o.name ?: "fio", 0); + if (ret) { + put_job(td); + return 0; + } + td = NULL; + } + if (!td) { + int is_section = !strncmp(opt, "name", 4); + int global = 0; + + if (!is_section || !strncmp(val, "global", 6)) + global = 1; + + if (is_section && skip_this_section(val)) + continue; + + td = get_new_job(global, &def_thread); + if (!td) + return 0; + } + + ret = fio_cmd_option_parse(td, opt, val); + break; + } + default: + do_exit++; + exit_val = 1; + break; + } + } + + if (do_exit) + exit(exit_val); + + if (td) { + if (!ret) + ret = add_job(td, td->o.name ?: "fio", 0); + if (ret) + put_job(td); + } + + while (optind < argc) { + ini_idx++; + ini_file = realloc(ini_file, ini_idx * sizeof(char *)); + ini_file[ini_idx - 1] = strdup(argv[optind]); + optind++; + } + + return ini_idx; +} + int parse_options(int argc, char *argv[]) { int job_files, i; + f_out = stdout; + f_err = stderr; + + fio_options_dup_and_init(l_opts); + if (setup_thread_area()) return 1; if (fill_def_thread()) return 1; job_files = parse_cmd_line(argc, argv); - if (!job_files) { - log_err("Need job file(s)\n"); - usage(); - return 1; - } for (i = 0; i < job_files; i++) { if (fill_def_thread()) @@ -1195,5 +1048,16 @@ int parse_options(int argc, char *argv[]) } free(ini_file); + options_mem_free(&def_thread); + + if (!thread_number) { + if (dump_cmdline) + return 0; + + log_err("No jobs defined(s)\n"); + usage(argv[0]); + return 1; + } + return 0; }