[PATCH] Abstract option handling
[fio.git] / init.c
diff --git a/init.c b/init.c
index 20dd625dfe3bb1a77b1209916f7b7dc754a19a37..2dbf805d5abea0ee793389a5098d1edda296fd50 100644 (file)
--- 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 <stdio.h>
 #include <stdlib.h>
@@ -15,6 +14,7 @@
 #include <sys/stat.h>
 
 #include "fio.h"
+#include "parse.h"
 
 /*
  * The default options
@@ -28,7 +28,6 @@
 #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_RWMIX_READ         (50)
 #define DEF_NICE               (0)
 #define DEF_NR_FILES           (1)
+#define DEF_UNLINK             (0)
+#define DEF_WRITE_BW_LOG       (0)
+#define DEF_WRITE_LAT_LOG      (0)
+
+#define td_var_offset(var)     ((size_t) &((struct thread_data *)0)->var)
+
+static int str_rw_cb(void *, char *);
+static int str_ioengine_cb(void *, char *);
+static int str_mem_cb(void *, char *);
+static int str_verify_cb(void *, char *);
+static int str_lockmem_cb(void *, unsigned long *);
+static int str_prio_cb(void *, unsigned int *);
+static int str_prioclass_cb(void *, unsigned int *);
+static int str_exitall_cb(void);
+static int str_cpumask_cb(void *, unsigned int *);
+
+/*
+ * Map of job/command line options
+ */
+static struct fio_option options[] = {
+       {
+               .name   = "name",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(name),
+       },
+       {
+               .name   = "directory",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(directory),
+       },
+       {
+               .name   = "filename",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(filename),
+       },
+       {
+               .name   = "rw",
+               .type   = FIO_OPT_STR,
+               .cb     = str_rw_cb,
+       },
+       {
+               .name   = "ioengine",
+               .type   = FIO_OPT_STR,
+               .cb     = str_ioengine_cb,
+       },
+       {
+               .name   = "mem",
+               .type   = FIO_OPT_STR,
+               .cb     = str_mem_cb,
+       },
+       {
+               .name   = "verify",
+               .type   = FIO_OPT_STR,
+               .cb     = str_verify_cb,
+       },
+       {
+               .name   = "write_iolog",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(write_iolog),
+       },
+       {
+               .name   = "iolog",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(iolog),
+       },
+       {
+               .name   = "exec_prerun",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(exec_prerun),
+       },
+       {
+               .name   = "exec_postrun",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(exec_postrun),
+       },
+#ifdef FIO_HAVE_IOSCHED_SWITCH
+       {
+               .name   = "ioscheduler",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(ioscheduler),
+       },
+#endif
+       {
+               .name   = "size",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(total_file_size),
+       },
+       {
+               .name   = "bs",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(bs),
+       },
+       {
+               .name   = "offset",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(start_offset),
+       },
+       {
+               .name   = "zonesize",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(zone_size),
+       },
+       {
+               .name   = "zoneskip",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(zone_skip),
+       },
+       {
+               .name   = "lockmem",
+               .type   = FIO_OPT_STR_VAL,
+               .cb     = str_lockmem_cb,
+       },
+       {
+               .name   = "bsrange",
+               .type   = FIO_OPT_RANGE,
+               .off1   = td_var_offset(min_bs),
+               .off2   = td_var_offset(max_bs),
+       },
+       {
+               .name   = "nrfiles",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(nr_files),
+       },
+       {
+               .name   = "iodepth",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(iodepth),
+       },
+       {
+               .name   = "fsync",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(fsync_blocks),
+       },
+       {
+               .name   = "rwmixcycle",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(rwmixcycle),
+       },
+       {
+               .name   = "rwmixread",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(rwmixread),
+               .max_val= 100,
+       },
+       {
+               .name   = "rwmixwrite",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(rwmixwrite),
+               .max_val= 100,
+       },
+       {
+               .name   = "nice",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(nice),
+       },
+#ifdef FIO_HAVE_IOPRIO
+       {
+               .name   = "prio",
+               .type   = FIO_OPT_INT,
+               .cb     = str_prio_cb,
+       },
+       {
+               .name   = "prioclass",
+               .type   = FIO_OPT_INT,
+               .cb     = str_prioclass_cb,
+       },
+#endif
+       {
+               .name   = "thinktime",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(thinktime)
+       },
+       {
+               .name   = "rate",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(rate)
+       },
+       {
+               .name   = "ratemin",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(ratemin)
+       },
+       {
+               .name   = "ratecycle",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(ratecycle)
+       },
+       {
+               .name   = "startdelay",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(start_delay)
+       },
+       {
+               .name   = "timeout",
+               .type   = FIO_OPT_STR_VAL_TIME,
+               .off1   = td_var_offset(timeout)
+       },
+       {
+               .name   = "invalidate",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(invalidate_cache)
+       },
+       {
+               .name   = "sync",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(sync_io)
+       },
+       {
+               .name   = "bwavgtime",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(bw_avg_time)
+       },
+       {
+               .name   = "create_serialize",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(create_serialize)
+       },
+       {
+               .name   = "create_fsync",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(create_fsync)
+       },
+       {
+               .name   = "loops",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(loops)
+       },
+       {
+               .name   = "numjobs",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(numjobs)
+       },
+       {
+               .name   = "cpuload",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(cpuload)
+       },
+       {
+               .name   = "cpuchunks",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(cpucycle)
+       },
+       {
+               .name   = "direct",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(odirect)
+       },
+       {
+               .name   = "overwrite",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(overwrite)
+       },
+#ifdef FIO_HAVE_CPU_AFFINITY
+       {
+               .name   = "cpumask",
+               .type   = FIO_OPT_INT,
+               .cb     = str_cpumask_cb,
+       },
+#endif
+       {
+               .name   = "end_fsync",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(end_fsync)
+       },
+       {
+               .name   = "unlink",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(unlink),
+       },
+       {
+               .name   = "exitall",
+               .type   = FIO_OPT_STR_SET,
+               .cb     = str_exitall_cb,
+       },
+       {
+               .name   = "stonewall",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(stonewall),
+       },
+       {
+               .name   = "thread",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(thread),
+       },
+       {
+               .name   = "write_bw_log",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(write_bw_log),
+       },
+       {
+               .name   = "write_lat_log",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(write_lat_log),
+       },
+       {
+               .name = NULL,
+       },
+};
 
 static int def_timeout = DEF_TIMEOUT;
 
@@ -59,14 +356,15 @@ 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;
 unsigned long long mlock_size = 0;
 FILE *f_out = NULL;
 FILE *f_err = NULL;
 
+static int write_lat_log = DEF_WRITE_LAT_LOG;
+static int write_bw_log = DEF_WRITE_BW_LOG;
+
 /*
  * Return a free job structure.
  */
@@ -93,6 +391,17 @@ static void put_job(struct thread_data *td)
        thread_number--;
 }
 
+static void fixup_options(struct thread_data *td)
+{
+       if (!td->min_bs)
+               td->min_bs = td->bs;
+       if (!td->max_bs)
+               td->max_bs = td->bs;
+
+       if (!td->rwmixread && td->rwmixwrite)
+               td->rwmixread = 100 - td->rwmixwrite;
+}
+
 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various
@@ -119,6 +428,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        }
 #endif
 
+       fixup_options(td);
+
        /*
         * the def_thread is just for options, it's not a real job
         */
@@ -140,7 +451,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                td->iodepth = 1;
        else {
                if (!td->iodepth)
-                       td->iodepth = 1;
+                       td->iodepth = td->nr_files;
        }
 
        /*
@@ -166,7 +477,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        if (td->odirect)
                td->io_ops->flags |= FIO_RAWIO;
 
-       if (td->filetype == FIO_TYPE_FILE) {
+       if (td->filename)
+               td->nr_uniq_files = 1;
+       else
+               td->nr_uniq_files = td->nr_files;
+
+       if (td->filetype == FIO_TYPE_FILE || td->filename) {
                char tmp[PATH_MAX];
                int len = 0;
                int i;
@@ -179,9 +495,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                for_each_file(td, f, i) {
                        memset(f, 0, sizeof(*f));
                        f->fd = -1;
-                       f->fileno = i;
 
-                       sprintf(tmp + len, "%s.%d.%d", jobname, td->thread_number, i);
+                       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);
                }
        } else {
@@ -220,11 +538,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        if (setup_rate(td))
                goto err;
 
-       if (write_lat_log) {
+       if (td->write_lat_log) {
                setup_log(&td->slat_log);
                setup_log(&td->clat_log);
        }
-       if (write_bw_log)
+       if (td->write_bw_log)
                setup_log(&td->bw_log);
 
        if (td->name[0] == '\0')
@@ -274,6 +592,7 @@ int init_random_state(struct thread_data *td)
 {
        unsigned long seeds[4];
        int fd, num_maps, blocks, i;
+       struct fio_file *f;
 
        fd = open("/dev/urandom", O_RDONLY);
        if (fd == -1) {
@@ -299,9 +618,7 @@ int init_random_state(struct thread_data *td)
        if (td->rand_repeatable)
                seeds[3] = DEF_RANDSEED;
 
-       for (i = 0; i < td->nr_files; i++) {
-               struct fio_file *f = &td->files[i];
-
+       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));
@@ -327,230 +644,6 @@ static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
 #endif
 }
 
-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;
-       }
-}
-
-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;
-       }
-}
-
-/*
- * 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]);
-       else
-               *val *= get_mult_time(str[len - 1]);
-       return 0;
-}
-
-static int check_str_bytes(char *p, char *name, unsigned long long *val)
-{
-       if (strncmp(p, name, strlen(name) - 1))
-               return 1;
-
-       return str_to_decimal(p, val, 1);
-}
-
-static int check_str_time(char *p, char *name, unsigned long long *val)
-{
-       if (strncmp(p, name, strlen(name) - 1))
-               return 1;
-
-       return str_to_decimal(p, val, 0);
-}
-
-static void strip_blank_front(char **p)
-{
-       char *s = *p;
-
-       while (isspace(*s))
-               s++;
-}
-
-static void strip_blank_end(char *p)
-{
-       char *s = p + strlen(p) - 1;
-
-       while (isspace(*s) || iscntrl(*s))
-               s--;
-
-       *(s + 1) = '\0';
-}
-
-typedef int (str_cb_fn)(struct thread_data *, char *);
-
-static int check_str(char *p, char *name, str_cb_fn *cb, struct thread_data *td)
-{
-       char *s;
-
-       if (strncmp(p, name, strlen(name)))
-               return 1;
-
-       s = strstr(p, name);
-       if (!s)
-               return 1;
-
-       s = strchr(s, '=');
-       if (!s)
-               return 1;
-
-       s++;
-       strip_blank_front(&s);
-       return cb(td, s);
-}
-
-static int check_strstore(char *p, char *name, char *dest)
-{
-       char *s;
-
-       if (strncmp(p, name, strlen(name)))
-               return 1;
-
-       s = strstr(p, name);
-       if (!s)
-               return 1;
-
-       s = strchr(p, '=');
-       if (!s)
-               return 1;
-
-       s++;
-       strip_blank_front(&s);
-
-       strcpy(dest, s);
-       return 0;
-}
-
-static int __check_range_bytes(char *str, unsigned long *val)
-{
-       char suffix;
-
-       if (sscanf(str, "%lu%c", val, &suffix) == 2) {
-               *val *= get_mult_bytes(suffix);
-               return 0;
-       }
-
-       if (sscanf(str, "%lu", val) == 1)
-               return 0;
-
-       return 1;
-}
-
-static int check_range_bytes(char *p, char *name, unsigned long *s,
-                            unsigned long *e)
-{
-       char option[128];
-       char *str, *p1, *p2;
-
-       if (strncmp(p, name, strlen(name)))
-               return 1;
-
-       strcpy(option, p);
-       p = option;
-
-       str = strstr(p, name);
-       if (!str)
-               return 1;
-
-       p += strlen(name);
-
-       str = strchr(p, '=');
-       if (!str)
-               return 1;
-
-       /*
-        * 'p' now holds whatever is after the '=' sign
-        */
-       p1 = str + 1;
-
-       /*
-        * terminate p1 at the '-' sign
-        */
-       p = strchr(p1, '-');
-       if (!p)
-               return 1;
-
-       p2 = p + 1;
-       *p = '\0';
-
-       if (!__check_range_bytes(p1, s) && !__check_range_bytes(p2, e))
-               return 0;
-
-       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;
@@ -565,8 +658,10 @@ static int is_empty_or_comment(char *line)
        return 1;
 }
 
-static int str_rw_cb(struct thread_data *td, char *mem)
+static int str_rw_cb(void *data, char *mem)
 {
+       struct thread_data *td = data;
+
        if (!strncmp(mem, "read", 4) || !strncmp(mem, "0", 1)) {
                td->ddir = DDIR_READ;
                td->sequential = 1;
@@ -599,8 +694,10 @@ static int str_rw_cb(struct thread_data *td, char *mem)
        return 1;
 }
 
-static int str_verify_cb(struct thread_data *td, char *mem)
+static int str_verify_cb(void *data, char *mem)
 {
+       struct thread_data *td = data;
+
        if (!strncmp(mem, "0", 1)) {
                td->verify = VERIFY_NONE;
                return 0;
@@ -616,8 +713,10 @@ static int str_verify_cb(struct thread_data *td, char *mem)
        return 1;
 }
 
-static int str_mem_cb(struct thread_data *td, char *mem)
+static int str_mem_cb(void *data, char *mem)
 {
+       struct thread_data *td = data;
+
        if (!strncmp(mem, "malloc", 6)) {
                td->mem_type = MEM_MALLOC;
                return 0;
@@ -633,8 +732,10 @@ static int str_mem_cb(struct thread_data *td, char *mem)
        return 1;
 }
 
-static int str_ioengine_cb(struct thread_data *td, char *str)
+static int str_ioengine_cb(void *data, char *str)
 {
+       struct thread_data *td = data;
+
        td->io_ops = load_ioengine(td, str);
        if (td->io_ops)
                return 0;
@@ -643,14 +744,48 @@ static int str_ioengine_cb(struct thread_data *td, char *str)
        return 1;
 }
 
+static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
+{
+       mlock_size = *val;
+       return 0;
+}
+
+static int str_prioclass_cb(void *data, unsigned int *val)
+{
+       struct thread_data *td = data;
+
+       td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
+       return 0;
+}
+
+static int str_prio_cb(void *data, unsigned int *val)
+{
+       struct thread_data *td = data;
+
+       td->ioprio |= *val;
+       return 0;
+}
+
+static int str_exitall_cb(void)
+{
+       exitall_on_terminate = 1;
+       return 0;
+}
+
+static int str_cpumask_cb(void *data, unsigned int *val)
+{
+       struct thread_data *td = data;
+
+       fill_cpu_mask(td->cpumask, *val);
+       return 0;
+}
+
 /*
  * 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;
+       unsigned int global;
        struct thread_data *td;
        char *string, *name, *tmpbuf;
        fpos_t off;
@@ -701,291 +836,18 @@ int parse_jobs_ini(char *file, int stonewall_flag)
                                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_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;
-                               break;
-#else
-                               td->ioscheduler = strdup(tmpbuf);
-                               fgetpos(f, &off);
-                               continue;
-#endif
-                       }
+                       fgetpos(f, &off);
 
                        /*
                         * 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 = parse_option(p, options, td);
                }
 
                if (!ret) {
@@ -1024,7 +886,6 @@ static int fill_def_thread(void)
        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;
@@ -1042,6 +903,9 @@ static int fill_def_thread(void)
        def_thread.nice = DEF_NICE;
        def_thread.rand_repeatable = DEF_RAND_REPEAT;
        def_thread.nr_files = DEF_NR_FILES;
+       def_thread.unlink = DEF_UNLINK;
+       def_thread.write_bw_log = write_bw_log;
+       def_thread.write_lat_log = write_lat_log;
 #ifdef FIO_HAVE_DISK_UTIL
        def_thread.do_disk_util = 1;
 #endif
@@ -1049,7 +913,7 @@ static int fill_def_thread(void)
        return 0;
 }
 
-static void usage(char *name)
+static void usage(void)
 {
        printf("%s\n", fio_version_string);
        printf("\t-o Write output to file\n");
@@ -1092,7 +956,7 @@ static int parse_cmd_line(int argc, char *argv[])
                                idx = optind;
                                break;
                        case 'h':
-                               usage(argv[0]);
+                               usage();
                                exit(0);
                        case 'v':
                                printf("%s\n", fio_version_string);
@@ -1176,7 +1040,7 @@ int parse_options(int argc, char *argv[])
        job_files = parse_cmd_line(argc, argv);
        if (!job_files) {
                log_err("Need job file(s)\n");
-               usage(argv[0]);
+               usage();
                return 1;
        }