[PATCH] Add seperate read/write block size options
[fio.git] / init.c
diff --git a/init.c b/init.c
index ddca4c5f806b0227543241cfb1eca81d855b0a5f..616c51f27ff738e7d2d2bd3eddbf7c924d693c3b 100644 (file)
--- a/init.c
+++ b/init.c
@@ -8,6 +8,8 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
+#include <getopt.h>
+#include <assert.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/types.h>
 #define DEF_UNLINK             (0)
 #define DEF_WRITE_BW_LOG       (0)
 #define DEF_WRITE_LAT_LOG      (0)
+#define DEF_NO_RAND_MAP                (0)
+
+#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 *);
+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_file),
+       },
+       {
+               .name   = "read_iolog",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(read_iolog_file),
+       },
+       {
+               .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[DDIR_READ]),
+       },
+       {
+               .name   = "read_bs",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(bs[DDIR_READ]),
+       },
+       {
+               .name   = "write_bs",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(bs[DDIR_WRITE]),
+       },
+       {
+               .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[DDIR_READ]),
+               .off2   = td_var_offset(max_bs[DDIR_READ]),
+       },
+       {
+               .name   = "read_bsrange",
+               .type   = FIO_OPT_RANGE,
+               .off1   = td_var_offset(min_bs[DDIR_READ]),
+               .off2   = td_var_offset(max_bs[DDIR_READ]),
+       },
+       {
+               .name   = "write_bsrange",
+               .type   = FIO_OPT_RANGE,
+               .off1   = td_var_offset(min_bs[DDIR_WRITE]),
+               .off2   = td_var_offset(max_bs[DDIR_WRITE]),
+       },
+       {
+               .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   = "norandommap",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(norandommap),
+       },
+       {
+               .name   = "bs_unaligned",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(bs_unaligned),
+       },
+       {
+               .name = NULL,
+       },
+};
+
+#define FIO_JOB_OPTS   (sizeof(options) / sizeof(struct fio_option))
+#define FIO_CMD_OPTS   (16)
+#define FIO_GETOPT_JOB (0x89988998)
+
+/*
+ * Command line options. These will contain the above, plus a few
+ * extra that only pertain to fio itself and not jobs.
+ */
+static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
+       {
+               .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           = NULL,
+       },
+};
 
 static int def_timeout = DEF_TIMEOUT;
 
-static char fio_version_string[] = "fio 1.5";
+static char fio_version_string[] = "fio 1.7";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -84,7 +458,6 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 
        td = &threads[thread_number++];
        *td = *parent;
-       td->name[0] = '\0';
 
        td->thread_number = thread_number;
        return td;
@@ -92,10 +465,71 @@ 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;
+
        memset(&threads[td->thread_number - 1], 0, sizeof(*td));
        thread_number--;
 }
 
+/*
+ * Lazy way of fixing up options that depend on each other. We could also
+ * define option callback handlers, but this is easier.
+ */
+static void fixup_options(struct thread_data *td)
+{
+       if (!td->rwmixread && td->rwmixwrite)
+               td->rwmixread = 100 - td->rwmixwrite;
+
+       if (td->write_iolog_file && td->read_iolog_file) {
+               log_err("fio: read iolog overrides write_iolog\n");
+               free(td->write_iolog_file);
+               td->write_iolog_file = NULL;
+       }
+
+       if (td->io_ops->flags & FIO_SYNCIO)
+               td->iodepth = 1;
+       else {
+               if (!td->iodepth)
+                       td->iodepth = td->nr_files;
+       }
+
+       /*
+        * only really works for sequential io for now, and with 1 file
+        */
+       if (td->zone_size && !td->sequential && td->nr_files == 1)
+               td->zone_size = 0;
+
+       /*
+        * Reads can do overwrites, we always need to pre-create the file
+        */
+       if (td_read(td) || td_rw(td))
+               td->overwrite = 1;
+
+       if (td->bs[DDIR_READ] != DEF_BS)
+               td->bs[DDIR_WRITE] = td->bs[DDIR_READ];
+       if (!td->min_bs[DDIR_READ])
+               td->min_bs[DDIR_READ]= td->bs[DDIR_READ];
+       if (!td->max_bs[DDIR_READ])
+               td->max_bs[DDIR_READ] = td->bs[DDIR_READ];
+       if (!td->min_bs[DDIR_WRITE])
+               td->min_bs[DDIR_WRITE]= td->bs[DDIR_READ];
+       if (!td->max_bs[DDIR_WRITE])
+               td->max_bs[DDIR_WRITE] = td->bs[DDIR_READ];
+
+       td->rw_min_bs = min(td->min_bs[DDIR_READ], td->min_bs[DDIR_WRITE]);
+
+       if (td_read(td) && !td_rw(td))
+               td->verify = 0;
+
+       if (td->norandommap && td->verify != VERIFY_NONE) {
+               log_err("fio: norandommap given, verify disabled\n");
+               td->verify = VERIFY_NONE;
+       }
+       if (td->bs_unaligned && (td->odirect || td->io_ops->flags & FIO_RAWIO))
+               log_err("fio: bs_unaligned may not work with raw io\n");
+}
+
 /*
  * Adds a job to the list of things todo. Sanitizes the various options
  * to make sure we don't have conflicts, and initializes various
@@ -139,24 +573,10 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                }
        }
 
-       if (td->io_ops->flags & FIO_SYNCIO)
-               td->iodepth = 1;
-       else {
-               if (!td->iodepth)
-                       td->iodepth = td->nr_files;
-       }
-
-       /*
-        * only really works for sequential io for now, and with 1 file
-        */
-       if (td->zone_size && !td->sequential && td->nr_files == 1)
-               td->zone_size = 0;
+       if (td->odirect)
+               td->io_ops->flags |= FIO_RAWIO;
 
-       /*
-        * Reads can do overwrites, we always need to pre-create the file
-        */
-       if (td_read(td) || td_rw(td))
-               td->overwrite = 1;
+       fixup_options(td);
 
        td->filetype = FIO_TYPE_FILE;
        if (!stat(jobname, &sb)) {
@@ -166,9 +586,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                        td->filetype = FIO_TYPE_CHAR;
        }
 
-       if (td->odirect)
-               td->io_ops->flags |= FIO_RAWIO;
-
        if (td->filename)
                td->nr_uniq_files = 1;
        else
@@ -215,13 +632,6 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        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 (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->stonewall && td->thread_number > 1)
                groupid++;
 
@@ -237,8 +647,8 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        if (td->write_bw_log)
                setup_log(&td->bw_log);
 
-       if (td->name[0] == '\0')
-               snprintf(td->name, sizeof(td->name)-1, "client%d", td->thread_number);
+       if (!td->name)
+               td->name = strdup(jobname);
 
        ddir = td->ddir + (!td->sequential << 1) + (td->iomix << 2);
 
@@ -247,7 +657,7 @@ static int add_job(struct thread_data *td, const char *jobname, int 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);
+                               fprintf(f_out, "%s: (g=%d): rw=%s, odir=%d, bs=%d-%d/%d-%d, rate=%d, ioengine=%s, iodepth=%d\n", td->name, td->groupid, ddir_str[ddir], td->odirect, td->min_bs[DDIR_READ], td->max_bs[DDIR_READ], td->min_bs[DDIR_WRITE], td->max_bs[DDIR_WRITE], td->rate, td->io_ops->name, td->iodepth);
                } else if (job_add_num == 1)
                        fprintf(f_out, "...\n");
        }
@@ -286,6 +696,9 @@ int init_random_state(struct thread_data *td)
        int fd, num_maps, blocks, i;
        struct fio_file *f;
 
+       if (td->io_ops->flags & FIO_CPUIO)
+               return 0;
+
        fd = open("/dev/urandom", O_RDONLY);
        if (fd == -1) {
                td_verror(td, errno);
@@ -310,12 +723,14 @@ int init_random_state(struct thread_data *td)
        if (td->rand_repeatable)
                seeds[3] = DEF_RANDSEED;
 
-       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->norandommap) {
+               for_each_file(td, f, i) {
+                       blocks = (f->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));
+                       f->num_maps = num_maps;
+                       memset(f->file_map, 0, num_maps * sizeof(long));
+               }
        }
 
        os_random_seed(seeds[3], &td->random_state);
@@ -350,7 +765,7 @@ static int is_empty_or_comment(char *line)
        return 1;
 }
 
-static int str_rw_cb(void *data, char *mem)
+static int str_rw_cb(void *data, const char *mem)
 {
        struct thread_data *td = data;
 
@@ -386,7 +801,7 @@ static int str_rw_cb(void *data, char *mem)
        return 1;
 }
 
-static int str_verify_cb(void *data, char *mem)
+static int str_verify_cb(void *data, const char *mem)
 {
        struct thread_data *td = data;
 
@@ -405,7 +820,7 @@ static int str_verify_cb(void *data, char *mem)
        return 1;
 }
 
-static int str_mem_cb(void *data, char *mem)
+static int str_mem_cb(void *data, const char *mem)
 {
        struct thread_data *td = data;
 
@@ -424,7 +839,7 @@ static int str_mem_cb(void *data, char *mem)
        return 1;
 }
 
-static int str_ioengine_cb(void *data, char *str)
+static int str_ioengine_cb(void *data, const char *str)
 {
        struct thread_data *td = data;
 
@@ -436,16 +851,50 @@ static int str_ioengine_cb(void *data, 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;
+       char *string, *name;
        fpos_t off;
        FILE *f;
        char *p;
@@ -459,15 +908,16 @@ int parse_jobs_ini(char *file, int stonewall_flag)
 
        string = malloc(4096);
        name = malloc(256);
-       tmpbuf = malloc(4096);
+       memset(name, 0, 256);
 
        stonewall = stonewall_flag;
-       while ((p = fgets(string, 4096, f)) != NULL) {
-               if (ret)
+       do {
+               p = fgets(string, 4095, f);
+               if (!p)
                        break;
                if (is_empty_or_comment(p))
                        continue;
-               if (sscanf(p, "[%s]", name) != 1)
+               if (sscanf(p, "[%255s]", name) != 1)
                        continue;
 
                global = !strncmp(name, "global", 6);
@@ -492,321 +942,35 @@ int parse_jobs_ini(char *file, int stonewall_flag)
                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;
+                       if (p[0] == '[')
                                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, "filename", tmpbuf)) {
-                               td->filename = 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, "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_strset(p, "write_bw_log")) {
-                               td->write_bw_log = 1;
-                               fgetpos(f, &off);
-                               continue;
-                       }
-                       if (!check_strset(p, "write_lat_log")) {
-                               td->write_lat_log = 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
-                       }
+
+                       strip_blank_end(p);
+
+                       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) {
                        fsetpos(f, &off);
                        ret = add_job(td, name, 0);
+               } else {
+                       log_err("fio: job %s dropped\n", name);
+                       put_job(td);
                }
-               if (ret)
-                       break;
-       }
+       } while (!ret);
 
        free(string);
        free(name);
-       free(tmpbuf);
        fclose(f);
        return ret;
 }
@@ -825,9 +989,10 @@ static int fill_def_thread(void)
         */
        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.bs[DDIR_READ] = DEF_BS;
+       def_thread.bs[DDIR_WRITE] = DEF_BS;
+       def_thread.min_bs[DDIR_READ] = def_thread.min_bs[DDIR_WRITE] = 0;
+       def_thread.max_bs[DDIR_READ] = def_thread.max_bs[DDIR_WRITE] = 0;
        def_thread.odirect = DEF_ODIRECT;
        def_thread.ratecycle = DEF_RATE_CYCLE;
        def_thread.sequential = DEF_SEQUENTIAL;
@@ -852,6 +1017,7 @@ static int fill_def_thread(void)
        def_thread.unlink = DEF_UNLINK;
        def_thread.write_bw_log = write_bw_log;
        def_thread.write_lat_log = write_lat_log;
+       def_thread.norandommap = DEF_NO_RAND_MAP;
 #ifdef FIO_HAVE_DISK_UTIL
        def_thread.do_disk_util = 1;
 #endif
@@ -862,64 +1028,92 @@ static int fill_def_thread(void)
 static void usage(void)
 {
        printf("%s\n", fio_version_string);
-       printf("\t-Write output to file\n");
-       printf("\t-Runtime in seconds\n");
-       printf("\t-Generate per-job latency logs\n");
-       printf("\t-Generate per-job bandwidth logs\n");
-       printf("\t-Minimal (terse) output\n");
-       printf("\t-Print version info and exit\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");
 }
 
 static int parse_cmd_line(int argc, char *argv[])
 {
-       int c, idx = 1, ini_idx = 0;
+       struct thread_data *td = NULL;
+       int c, ini_idx = 0, lidx, ret;
 
-       while ((c = getopt(argc, argv, "t:o:lwvhm")) != EOF) {
+       while ((c = getopt_long(argc, argv, "", long_options, &lidx)) != -1) {
                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);
+               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();
+                       exit(0);
+               case 'v':
+                       printf("%s\n", fio_version_string);
+                       exit(0);
+               case FIO_GETOPT_JOB: {
+                       const char *opt = long_options[lidx].name;
+                       char *val = optarg;
+
+                       if (!strncmp(opt, "name", 4) && td) {
+                               ret = add_job(td, td->name ?: "fio", 0);
+                               if (ret) {
+                                       put_job(td);
+                                       return 0;
                                }
-                               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);
+                               td = NULL;
+                       }
+                       if (!td) {
+                               int global = !strncmp(val, "global", 6);
+
+                               td = get_new_job(global, &def_thread);
+                               if (!td)
+                                       return 0;
+                       }
+
+                       ret = parse_cmd_option(opt, val, options, td);
+                       if (ret) {
+                               log_err("fio: job dropped\n");
+                               put_job(td);
+                               td = NULL;
+                       }
+                       break;
+               }
+               default:
+                       printf("optarg <<%s>>\n", argv[optind]);
+                       break;
                }
        }
 
-       while (idx < argc) {
-               ini_idx++;
-               ini_file = realloc(ini_file, ini_idx * sizeof(char *));
-               ini_file[ini_idx - 1] = strdup(argv[idx]);
-               idx++;
+       if (td) {
+               ret = add_job(td, td->name ?: "fio", 0);
+               if (ret)
+                       put_job(td);
        }
 
-       if (!f_out) {
-               f_out = stdout;
-               f_err = stderr;
+       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;
@@ -974,21 +1168,49 @@ static int setup_thread_area(void)
        return 0;
 }
 
+/*
+ * Copy the fio options into the long options map, so we mirror
+ * job and cmd line options.
+ */
+static void dupe_job_options(void)
+{
+       struct fio_option *o;
+       unsigned int i;
+
+       i = 0;
+       while (long_options[i].name)
+               i++;
+
+       o = &options[0];
+       while (o->name) {
+               long_options[i].name = o->name;
+               long_options[i].val = FIO_GETOPT_JOB;
+               if (o->type == FIO_OPT_STR_SET)
+                       long_options[i].has_arg = no_argument;
+               else
+                       long_options[i].has_arg = required_argument;
+
+               i++;
+               o++;
+               assert(i < FIO_JOB_OPTS + FIO_CMD_OPTS);
+       }
+}
+
 int parse_options(int argc, char *argv[])
 {
        int job_files, i;
 
+       f_out = stdout;
+       f_err = stderr;
+
+       dupe_job_options();
+
        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())
@@ -999,5 +1221,11 @@ int parse_options(int argc, char *argv[])
        }
 
        free(ini_file);
+
+       if (!thread_number) {
+               log_err("No jobs defined(s)\n");
+               return 1;
+       }
+
        return 0;
 }