Unify client/server argument
[fio.git] / init.c
diff --git a/init.c b/init.c
index 3142d8ca7a8dd9c32e606ea6bc2c7d49843f8b15..849bcf9fd5e28d4ffab1979059d373ad153ae495 100644 (file)
--- a/init.c
+++ b/init.c
@@ -8,7 +8,6 @@
 #include <ctype.h>
 #include <string.h>
 #include <errno.h>
-#include <getopt.h>
 #include <sys/ipc.h>
 #include <sys/shm.h>
 #include <sys/types.h>
 #include "parse.h"
 #include "smalloc.h"
 #include "filehash.h"
+#include "verify.h"
+#include "profile.h"
+#include "server.h"
 
-static char fio_version_string[] = "fio 1.23";
+#include "lib/getopt.h"
+
+#if FIO_PATCH > 0
+static char fio_version_string[] =     __fio_stringify(FIO_MAJOR) "."  \
+                                       __fio_stringify(FIO_MINOR) "."  \
+                                       __fio_stringify(FIO_PATCH);
+#else
+static char fio_version_string[] =     __fio_stringify(FIO_MAJOR) "."  \
+                                       __fio_stringify(FIO_MINOR);
+#endif
 
 #define FIO_RANDSEED           (0xb1899bedUL)
 
 static char **ini_file;
-static int max_jobs = MAX_JOBS;
+static int max_jobs = FIO_MAX_JOBS;
 static int dump_cmdline;
+static int def_timeout;
 
 static struct thread_data def_thread;
 struct thread_data *threads = NULL;
@@ -36,12 +48,18 @@ int eta_print;
 unsigned long long mlock_size = 0;
 FILE *f_out = NULL;
 FILE *f_err = NULL;
-char *job_section = NULL;
+char **job_sections = NULL;
+int nr_job_sections = 0;
+char *exec_profile = NULL;
+int warnings_fatal = 0;
+int terse_version = 2;
+int is_backend = 0;
+int nr_clients = 0;
+int log_syslog = 0;
 
 int write_bw_log = 0;
 int read_only = 0;
 
-static int def_timeout;
 static int write_lat_log;
 
 static int prev_group_jobs;
@@ -50,94 +68,209 @@ unsigned long fio_debug = 0;
 unsigned int fio_debug_jobno = -1;
 unsigned int *fio_debug_jobp = NULL;
 
+static char cmd_optstr[256];
+static int did_arg;
+
+const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN] = {
+       { .u.f  =  1.0 },
+       { .u.f  =  5.0 },
+       { .u.f  = 10.0 },
+       { .u.f  = 20.0 },
+       { .u.f  = 30.0 },
+       { .u.f  = 40.0 },
+       { .u.f  = 50.0 },
+       { .u.f  = 60.0 },
+       { .u.f  = 70.0 },
+       { .u.f  = 80.0 },
+       { .u.f  = 90.0 },
+       { .u.f  = 95.0 },
+       { .u.f  = 99.0 },
+       { .u.f  = 99.5 },
+       { .u.f  = 99.9 },
+};
+
+#define FIO_CLIENT_FLAG                (1 << 16)
+
 /*
  * 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",
+               .name           = (char *) "output",
                .has_arg        = required_argument,
-               .val            = 'o',
+               .val            = 'o' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "timeout",
+               .name           = (char *) "timeout",
                .has_arg        = required_argument,
-               .val            = 't',
+               .val            = 't' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "latency-log",
+               .name           = (char *) "latency-log",
                .has_arg        = required_argument,
-               .val            = 'l',
+               .val            = 'l' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "bandwidth-log",
+               .name           = (char *) "bandwidth-log",
                .has_arg        = required_argument,
-               .val            = 'b',
+               .val            = 'b' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "minimal",
+               .name           = (char *) "minimal",
                .has_arg        = optional_argument,
-               .val            = 'm',
+               .val            = 'm' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "version",
+               .name           = (char *) "version",
                .has_arg        = no_argument,
-               .val            = 'v',
+               .val            = 'v' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "help",
+               .name           = (char *) "help",
                .has_arg        = no_argument,
-               .val            = 'h',
+               .val            = 'h' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "cmdhelp",
+               .name           = (char *) "cmdhelp",
                .has_arg        = optional_argument,
-               .val            = 'c',
+               .val            = 'c' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "showcmd",
+               .name           = (char *) "showcmd",
                .has_arg        = no_argument,
-               .val            = 's',
+               .val            = 's' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "readonly",
+               .name           = (char *) "readonly",
                .has_arg        = no_argument,
-               .val            = 'r',
+               .val            = 'r' | FIO_CLIENT_FLAG,
+       },
+       {
+               .name           = (char *) "eta",
+               .has_arg        = required_argument,
+               .val            = 'e' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "eta",
+               .name           = (char *) "debug",
                .has_arg        = required_argument,
-               .val            = 'e',
+               .val            = 'd' | FIO_CLIENT_FLAG,
+       },
+       {
+               .name           = (char *) "section",
+               .has_arg        = required_argument,
+               .val            = 'x' | FIO_CLIENT_FLAG,
+       },
+       {
+               .name           = (char *) "alloc-size",
+               .has_arg        = required_argument,
+               .val            = 'a' | FIO_CLIENT_FLAG,
+       },
+       {
+               .name           = (char *) "profile",
+               .has_arg        = required_argument,
+               .val            = 'p' | FIO_CLIENT_FLAG,
+       },
+       {
+               .name           = (char *) "warnings-fatal",
+               .has_arg        = no_argument,
+               .val            = 'w' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "debug",
+               .name           = (char *) "max-jobs",
                .has_arg        = required_argument,
-               .val            = 'd',
+               .val            = 'j' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "section",
+               .name           = (char *) "terse-version",
                .has_arg        = required_argument,
-               .val            = 'x',
+               .val            = 'V' | FIO_CLIENT_FLAG,
        },
        {
-               .name           = "alloc-size",
+               .name           = (char *) "server",
+               .has_arg        = optional_argument,
+               .val            = 'S',
+       },
+       {       .name           = (char *) "daemonize",
+               .has_arg        = no_argument,
+               .val            = 'D',
+       },
+       {
+               .name           = (char *) "client",
                .has_arg        = required_argument,
-               .val            = 'a',
+               .val            = 'C',
        },
        {
                .name           = NULL,
        },
 };
 
-FILE *get_f_out()
+static void free_shm(void)
 {
-       return f_out;
+       struct shmid_ds sbuf;
+
+       if (threads) {
+               void *tp = threads;
+
+               threads = NULL;
+               file_hash_exit();
+               fio_debug_jobp = NULL;
+               shmdt(tp);
+               shmctl(shm_id, IPC_RMID, &sbuf);
+       }
+
+       scleanup();
 }
 
-FILE *get_f_err()
+/*
+ * 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. We use the end of the region for keeping track of
+ * open files across jobs, for file sharing.
+ */
+static int setup_thread_area(void)
 {
-       return f_err;
+       void *hash;
+
+       if (threads)
+               return 0;
+
+       /*
+        * 1024 is too much on some machines, scale max_jobs if
+        * we get a failure that looks like too large a shm segment
+        */
+       do {
+               size_t size = max_jobs * sizeof(struct thread_data);
+
+               size += file_hash_size;
+               size += sizeof(unsigned int);
+
+               shm_id = shmget(0, size, IPC_CREAT | 0600);
+               if (shm_id != -1)
+                       break;
+               if (errno != EINVAL) {
+                       perror("shmget");
+                       break;
+               }
+
+               max_jobs >>= 1;
+       } while (max_jobs);
+
+       if (shm_id == -1)
+               return 1;
+
+       threads = shmat(shm_id, NULL, 0);
+       if (threads == (void *) -1) {
+               perror("shmat");
+               return 1;
+       }
+
+       memset(threads, 0, max_jobs * sizeof(struct thread_data));
+       hash = (void *) threads + max_jobs * sizeof(struct thread_data);
+       fio_debug_jobp = (void *) hash + file_hash_size;
+       *fio_debug_jobp = -1;
+       file_hash_init(hash);
+       return 0;
 }
 
 /*
@@ -149,15 +282,26 @@ static struct thread_data *get_new_job(int global, struct thread_data *parent)
 
        if (global)
                return &def_thread;
-       if (thread_number >= max_jobs)
+       if (setup_thread_area()) {
+               log_err("error: failed to setup shm segment\n");
+               return NULL;
+       }
+       if (thread_number >= max_jobs) {
+               log_err("error: maximum number of jobs (%d) reached.\n",
+                               max_jobs);
                return NULL;
+       }
 
        td = &threads[thread_number++];
        *td = *parent;
 
+       td->o.uid = td->o.gid = -1U;
+
        dup_files(td, parent);
        options_mem_dupe(td);
 
+       profile_add_hooks(td);
+
        td->thread_number = thread_number;
        return td;
 }
@@ -167,6 +311,8 @@ static void put_job(struct thread_data *td)
        if (td == &def_thread)
                return;
 
+       profile_td_exit(td);
+
        if (td->error)
                log_info("fio: %s\n", td->verror);
 
@@ -174,38 +320,47 @@ static void put_job(struct thread_data *td)
        thread_number--;
 }
 
-static int setup_rate(struct thread_data *td)
+static int __setup_rate(struct thread_data *td, enum fio_ddir ddir)
 {
-       unsigned long nr_reads_per_msec;
-       unsigned long long rate;
-       unsigned int bs;
+       unsigned int bs = td->o.min_bs[ddir];
+       unsigned long long bytes_per_sec;
 
-       if (!td->o.rate && !td->o.rate_iops)
-               return 0;
+       assert(ddir_rw(ddir));
 
-       if (td_rw(td))
-               bs = td->o.rw_min_bs;
-       else if (td_read(td))
-               bs = td->o.min_bs[DDIR_READ];
+       if (td->o.rate[ddir])
+               bytes_per_sec = td->o.rate[ddir];
        else
-               bs = td->o.min_bs[DDIR_WRITE];
+               bytes_per_sec = td->o.rate_iops[ddir] * bs;
 
-       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) {
+       if (!bytes_per_sec) {
                log_err("rate lower than supported\n");
                return -1;
        }
 
-       td->rate_usec_cycle = 1000000000ULL / nr_reads_per_msec;
-       td->rate_pending_usleep = 0;
+       td->rate_nsec_cycle[ddir] = 1000000000ULL / bytes_per_sec;
+       td->rate_pending_usleep[ddir] = 0;
        return 0;
 }
 
+static int setup_rate(struct thread_data *td)
+{
+       int ret = 0;
+
+       if (td->o.rate[DDIR_READ] || td->o.rate_iops[DDIR_READ])
+               ret = __setup_rate(td, DDIR_READ);
+       if (td->o.rate[DDIR_WRITE] || td->o.rate_iops[DDIR_WRITE])
+               ret |= __setup_rate(td, DDIR_WRITE);
+
+       return ret;
+}
+
+static int fixed_block_size(struct thread_options *o)
+{
+       return o->min_bs[DDIR_READ] == o->max_bs[DDIR_READ] &&
+               o->min_bs[DDIR_WRITE] == o->max_bs[DDIR_WRITE] &&
+               o->min_bs[DDIR_READ] == o->min_bs[DDIR_WRITE];
+}
+
 /*
  * Lazy way of fixing up options that depend on each other. We could also
  * define option callback handlers, but this is easier.
@@ -213,34 +368,23 @@ static int setup_rate(struct thread_data *td)
 static int fixup_options(struct thread_data *td)
 {
        struct thread_options *o = &td->o;
+       int ret = 0;
 
 #ifndef FIO_HAVE_PSHARED_MUTEX
-       if (!td->o.use_thread) {
+       if (!o->use_thread) {
                log_info("fio: this platform does not support process shared"
                         " mutexes, forcing use of threads. Use the 'thread'"
                         " option to get rid of this warning.\n");
-               td->o.use_thread = 1;
+               o->use_thread = 1;
+               ret = warnings_fatal;
        }
 #endif
 
-#ifndef FIO_HAVE_CPU_AFFINITY
-       if (td->o.gtod_cpu) {
-               log_err("fio: platform must support CPU affinity for"
-                       "gettimeofday() offloading\n");
-               return 1;
-       }
-#endif
-
-       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;
-       }
-
        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;
+               ret = warnings_fatal;
        }
 
        /*
@@ -266,12 +410,31 @@ static int fixup_options(struct thread_data *td)
 
        o->rw_min_bs = min(o->min_bs[DDIR_READ], o->min_bs[DDIR_WRITE]);
 
+       /*
+        * For random IO, allow blockalign offset other than min_bs.
+        */
+       if (!o->ba[DDIR_READ] || !td_random(td))
+               o->ba[DDIR_READ] = o->min_bs[DDIR_READ];
+       if (!o->ba[DDIR_WRITE] || !td_random(td))
+               o->ba[DDIR_WRITE] = o->min_bs[DDIR_WRITE];
+
+       if ((o->ba[DDIR_READ] != o->min_bs[DDIR_READ] ||
+           o->ba[DDIR_WRITE] != o->min_bs[DDIR_WRITE]) &&
+           !o->norandommap) {
+               log_err("fio: Any use of blockalign= turns off randommap\n");
+               o->norandommap = 1;
+               ret = warnings_fatal;
+       }
+
        if (!o->file_size_high)
                o->file_size_high = o->file_size_low;
 
-       if (o->norandommap && o->verify != VERIFY_NONE) {
-               log_err("fio: norandommap given, verify disabled\n");
+       if (o->norandommap && o->verify != VERIFY_NONE
+           && !fixed_block_size(o))  {
+               log_err("fio: norandommap given for variable block sizes, "
+                       "verify disabled\n");
                o->verify = VERIFY_NONE;
+               ret = warnings_fatal;
        }
        if (o->bs_unaligned && (o->odirect || td->io_ops->flags & FIO_RAWIO))
                log_err("fio: bs_unaligned may not work with raw io\n");
@@ -309,31 +472,64 @@ static int fixup_options(struct thread_data *td)
        if (o->open_files > o->nr_files || !o->open_files)
                o->open_files = o->nr_files;
 
-       if ((o->rate && o->rate_iops) || (o->ratemin && o->rate_iops_min)) {
+       if (((o->rate[0] + o->rate[1]) && (o->rate_iops[0] + o->rate_iops[1]))||
+           ((o->ratemin[0] + o->ratemin[1]) && (o->rate_iops_min[0] +
+               o->rate_iops_min[1]))) {
                log_err("fio: rate and rate_iops are mutually exclusive\n");
-               return 1;
+               ret = 1;
        }
-       if ((o->rate < o->ratemin) || (o->rate_iops < o->rate_iops_min)) {
+       if ((o->rate[0] < o->ratemin[0]) || (o->rate[1] < o->ratemin[1]) ||
+           (o->rate_iops[0] < o->rate_iops_min[0]) ||
+           (o->rate_iops[1] < o->rate_iops_min[1])) {
                log_err("fio: minimum rate exceeds rate\n");
-               return 1;
+               ret = 1;
        }
 
        if (!o->timeout && o->time_based) {
                log_err("fio: time_based requires a runtime/timeout setting\n");
                o->time_based = 0;
+               ret = warnings_fatal;
        }
 
        if (o->fill_device && !o->size)
                o->size = -1ULL;
 
-       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 (o->verify != VERIFY_NONE) {
+               if (td_write(td) && o->do_verify && o->numjobs > 1) {
+                       log_info("Multiple writers may overwrite blocks that "
+                               "belong to other jobs. This can cause "
+                               "verification failures.\n");
+                       ret = warnings_fatal;
+               }
 
-       if (td->o.verify != VERIFY_NONE)
-               td->o.refill_buffers = 1;
+               o->refill_buffers = 1;
+               if (o->max_bs[DDIR_WRITE] != o->min_bs[DDIR_WRITE] &&
+                   !o->verify_interval)
+                       o->verify_interval = o->min_bs[DDIR_WRITE];
+       }
 
-       return 0;
+       if (o->pre_read) {
+               o->invalidate_cache = 0;
+               if (td->io_ops->flags & FIO_PIPEIO) {
+                       log_info("fio: cannot pre-read files with an IO engine"
+                                " that isn't seekable. Pre-read disabled.\n");
+                       ret = warnings_fatal;
+               }
+       }
+
+#ifndef FIO_HAVE_FDATASYNC
+       if (o->fdatasync_blocks) {
+               log_info("fio: this platform does not support fdatasync()"
+                        " falling back to using fsync().  Use the 'fsync'"
+                        " option instead of 'fdatasync' to get rid of"
+                        " this warning\n");
+               o->fsync_blocks = o->fdatasync_blocks;
+               o->fdatasync_blocks = 0;
+               ret = warnings_fatal;
+       }
+#endif
+
+       return ret;
 }
 
 /*
@@ -378,19 +574,72 @@ static int exists_and_not_file(const char *filename)
        if (lstat(filename, &sb) == -1)
                return 0;
 
-       if (S_ISREG(sb.st_mode))
+       /* \\.\ is the device namespace in Windows, where every file
+        * is a device node */
+       if (S_ISREG(sb.st_mode) && strncmp(filename, "\\\\.\\", 4) != 0)
                return 0;
 
        return 1;
 }
 
+static void td_fill_rand_seeds_os(struct thread_data *td)
+{
+       os_random_seed(td->rand_seeds[0], &td->bsrange_state);
+       os_random_seed(td->rand_seeds[1], &td->verify_state);
+       os_random_seed(td->rand_seeds[2], &td->rwmix_state);
+
+       if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
+               os_random_seed(td->rand_seeds[3], &td->next_file_state);
+
+       os_random_seed(td->rand_seeds[5], &td->file_size_state);
+       os_random_seed(td->rand_seeds[6], &td->trim_state);
+
+       if (!td_random(td))
+               return;
+
+       if (td->o.rand_repeatable)
+               td->rand_seeds[4] = FIO_RANDSEED * td->thread_number;
+
+       os_random_seed(td->rand_seeds[4], &td->random_state);
+}
+
+static void td_fill_rand_seeds_internal(struct thread_data *td)
+{
+       init_rand_seed(&td->__bsrange_state, td->rand_seeds[0]);
+       init_rand_seed(&td->__verify_state, td->rand_seeds[1]);
+       init_rand_seed(&td->__rwmix_state, td->rand_seeds[2]);
+
+       if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
+               init_rand_seed(&td->__next_file_state, td->rand_seeds[3]);
+
+       init_rand_seed(&td->__file_size_state, td->rand_seeds[5]);
+       init_rand_seed(&td->__trim_state, td->rand_seeds[6]);
+
+       if (!td_random(td))
+               return;
+
+       if (td->o.rand_repeatable)
+               td->rand_seeds[4] = FIO_RANDSEED * td->thread_number;
+
+       init_rand_seed(&td->__random_state, td->rand_seeds[4]);
+}
+
+void td_fill_rand_seeds(struct thread_data *td)
+{
+       if (td->o.use_os_rand)
+               td_fill_rand_seeds_os(td);
+       else
+               td_fill_rand_seeds_internal(td);
+
+       init_rand_seed(&td->buf_state, td->rand_seeds[7]);
+}
+
 /*
  * Initialize the various random states we need (random io, block size ranges,
  * read/write mix, etc).
  */
 static int init_random_state(struct thread_data *td)
 {
-       unsigned long seeds[6];
        int fd;
 
        fd = open("/dev/urandom", O_RDONLY);
@@ -399,30 +648,15 @@ static int init_random_state(struct thread_data *td)
                return 1;
        }
 
-       if (read(fd, seeds, sizeof(seeds)) < (int) sizeof(seeds)) {
+       if (read(fd, td->rand_seeds, sizeof(td->rand_seeds)) <
+           (int) sizeof(td->rand_seeds)) {
                td_verror(td, EIO, "read");
                close(fd);
                return 1;
        }
 
        close(fd);
-
-       os_random_seed(seeds[0], &td->bsrange_state);
-       os_random_seed(seeds[1], &td->verify_state);
-       os_random_seed(seeds[2], &td->rwmix_state);
-
-       if (td->o.file_service_type == FIO_FSERVICE_RANDOM)
-               os_random_seed(seeds[3], &td->next_file_state);
-
-       os_random_seed(seeds[5], &td->file_size_state);
-
-       if (!td_random(td))
-               return 0;
-
-       if (td->o.rand_repeatable)
-               seeds[4] = FIO_RANDSEED * td->thread_number;
-
-       os_random_seed(seeds[4], &td->random_state);
+       td_fill_rand_seeds(td);
        return 0;
 }
 
@@ -454,6 +688,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                return 0;
        }
 
+       if (profile_td_init(td))
+               goto err;
+
        engine = get_engine_name(td->o.ioengine);
        td->io_ops = load_ioengine(td, engine);
        if (!td->io_ops) {
@@ -496,13 +733,19 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
 
        td->mutex = fio_mutex_init(0);
 
+       td->ts.clat_percentiles = td->o.clat_percentiles;
+       if (td->o.overwrite_plist)
+               memcpy(td->ts.percentile_list, td->o.percentile_list, sizeof(td->o.percentile_list));
+       else
+               memcpy(td->ts.percentile_list, def_percentile_list, sizeof(def_percentile_list));
+
        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.lat_stat[0].min_val = td->ts.lat_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;
+       td->ddir_seq_nr = td->o.ddir_seq_nr;
 
-       if ((td->o.stonewall || td->o.numjobs > 1 || td->o.new_group)
-            && prev_group_jobs) {
+       if ((td->o.stonewall || td->o.new_group) && prev_group_jobs) {
                prev_group_jobs = 0;
                groupid++;
        }
@@ -517,11 +760,14 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                goto err;
 
        if (td->o.write_lat_log) {
-               setup_log(&td->ts.slat_log);
-               setup_log(&td->ts.clat_log);
+               setup_log(&td->lat_log);
+               setup_log(&td->slat_log);
+               setup_log(&td->clat_log);
        }
        if (td->o.write_bw_log)
-               setup_log(&td->ts.bw_log);
+               setup_log(&td->bw_log);
+       if (td->o.write_iops_log)
+               setup_log(&td->iops_log);
 
        if (!td->o.name)
                td->o.name = strdup(jobname);
@@ -576,6 +822,7 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                if (file_alloced) {
                        td_new->o.filename = NULL;
                        td_new->files_index = 0;
+                       td_new->files_size = 0;
                        td_new->files = NULL;
                }
 
@@ -591,14 +838,57 @@ err:
        return -1;
 }
 
+/*
+ * Parse as if 'o' was a command line
+ */
+void add_job_opts(const char **o)
+{
+       struct thread_data *td, *td_parent;
+       int i, in_global = 1;
+       char jobname[32];
+
+       i = 0;
+       td_parent = td = NULL;
+       while (o[i]) {
+               if (!strncmp(o[i], "name", 4)) {
+                       in_global = 0;
+                       if (td)
+                               add_job(td, jobname, 0);
+                       td = NULL;
+                       sprintf(jobname, "%s", o[i] + 5);
+               }
+               if (in_global && !td_parent)
+                       td_parent = get_new_job(1, &def_thread);
+               else if (!in_global && !td) {
+                       if (!td_parent)
+                               td_parent = &def_thread;
+                       td = get_new_job(0, td_parent);
+               }
+               if (in_global)
+                       fio_options_parse(td_parent, (char **) &o[i], 1);
+               else
+                       fio_options_parse(td, (char **) &o[i], 1);
+               i++;
+       }
+
+       if (td)
+               add_job(td, jobname, 0);
+}
+
 static int skip_this_section(const char *name)
 {
-       if (!job_section)
+       int i;
+
+       if (!nr_job_sections)
                return 0;
        if (!strncmp(name, "global", 6))
                return 0;
 
-       return strncmp(job_section, name, strlen(job_section));
+       for (i = 0; i < nr_job_sections; i++)
+               if (!strcmp(job_sections[i], name))
+                       return 0;
+
+       return 1;
 }
 
 static int is_empty_or_comment(char *line)
@@ -610,7 +900,7 @@ static int is_empty_or_comment(char *line)
                        return 1;
                if (line[i] == '#')
                        return 1;
-               if (!isspace(line[i]) && !iscntrl(line[i]))
+               if (!isspace((int) line[i]) && !iscntrl((int) line[i]))
                        return 0;
        }
 
@@ -620,7 +910,7 @@ static int is_empty_or_comment(char *line)
 /*
  * This is our [ini] type file parser.
  */
-static int parse_jobs_ini(char *file, int stonewall_flag)
+int parse_jobs_ini(char *file, int is_buf, int stonewall_flag)
 {
        unsigned int global;
        struct thread_data *td;
@@ -634,14 +924,18 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
        char **opts;
        int i, alloc_opts, num_opts;
 
-       if (!strcmp(file, "-"))
-               f = stdin;
-       else
-               f = fopen(file, "r");
+       if (is_buf)
+               f = NULL;
+       else {
+               if (!strcmp(file, "-"))
+                       f = stdin;
+               else
+                       f = fopen(file, "r");
 
-       if (!f) {
-               perror("fopen job file");
-               return 1;
+               if (!f) {
+                       perror("fopen job file");
+                       return 1;
+               }
        }
 
        string = malloc(4096);
@@ -663,7 +957,10 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                 * haven't handled.
                 */
                if (!skip_fgets) {
-                       p = fgets(string, 4095, f);
+                       if (is_buf)
+                               p = strsep(&file, "\n");
+                       else
+                               p = fgets(string, 4095, f);
                        if (!p)
                                break;
                }
@@ -674,7 +971,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
                if (is_empty_or_comment(p))
                        continue;
-               if (sscanf(p, "[%255s]", name) != 1) {
+               if (sscanf(p, "[%255[^\n]]", name) != 1) {
                        if (inside_skip)
                                continue;
                        log_err("fio: option <%s> outside of [] job section\n",
@@ -682,6 +979,8 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                        break;
                }
 
+               name[strlen(name) - 1] = '\0';
+
                if (skip_this_section(name)) {
                        inside_skip = 1;
                        continue;
@@ -690,8 +989,6 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
 
                global = !strncmp(name, "global", 6);
 
-               name[strlen(name) - 1] = '\0';
-
                if (dump_cmdline) {
                        if (first_sect)
                                log_info("fio ");
@@ -717,7 +1014,14 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
                num_opts = 0;
                memset(opts, 0, alloc_opts * sizeof(char *));
 
-               while ((p = fgets(string, 4096, f)) != NULL) {
+               while (1) {
+                       if (is_buf)
+                               p = strsep(&file, "\n");
+                       else
+                               p = fgets(string, 4096, f);
+                       if (!p)
+                               break;
+
                        if (is_empty_or_comment(p))
                                continue;
 
@@ -770,7 +1074,7 @@ static int parse_jobs_ini(char *file, int stonewall_flag)
        free(string);
        free(name);
        free(opts);
-       if (f != stdin)
+       if (!is_buf && f != stdin)
                fclose(f);
        return ret;
 }
@@ -780,88 +1084,18 @@ static int fill_def_thread(void)
        memset(&def_thread, 0, sizeof(def_thread));
 
        fio_getaffinity(getpid(), &def_thread.o.cpumask);
+       def_thread.o.timeout = def_timeout;
 
        /*
         * fill default options
         */
        fio_fill_default_options(&def_thread);
-
-       def_thread.o.timeout = def_timeout;
-       def_thread.o.write_bw_log = write_bw_log;
-       def_thread.o.write_lat_log = write_lat_log;
-
-       return 0;
-}
-
-static void free_shm(void)
-{
-       struct shmid_ds sbuf;
-
-       if (threads) {
-               void *tp = threads;
-
-               threads = NULL;
-               file_hash_exit();
-               fio_debug_jobp = NULL;
-               shmdt(tp);
-               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. 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
-        */
-       do {
-               size_t size = max_jobs * sizeof(struct thread_data);
-
-               size += file_hash_size;
-               size += sizeof(unsigned int);
-
-               shm_id = shmget(0, size, IPC_CREAT | 0600);
-               if (shm_id != -1)
-                       break;
-               if (errno != EINVAL) {
-                       perror("shmget");
-                       break;
-               }
-
-               max_jobs >>= 1;
-       } while (max_jobs);
-
-       if (shm_id == -1)
-               return 1;
-
-       threads = shmat(shm_id, NULL, 0);
-       if (threads == (void *) -1) {
-               perror("shmat");
-               return 1;
-       }
-
-       memset(threads, 0, max_jobs * sizeof(struct thread_data));
-       hash = (void *) threads + max_jobs * sizeof(struct thread_data);
-       fio_debug_jobp = (void *) hash + file_hash_size;
-       *fio_debug_jobp = -1;
-       file_hash_init(hash);
-       atexit(free_shm);
        return 0;
 }
 
 static void usage(const char *name)
 {
-       printf("%s\n", fio_version_string);
+       printf("fio %s\n", fio_version_string);
        printf("%s [options] [job options] <job file(s)>\n", name);
        printf("\t--debug=options\tEnable debug logging\n");
        printf("\t--output\tWrite output to file\n");
@@ -870,6 +1104,7 @@ static void usage(const char *name)
        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--terse-version=x Terse version output format\n");
        printf("\t--help\t\tPrint this page\n");
        printf("\t--cmdhelp=cmd\tPrint command help, \"all\" for all of"
                " them\n");
@@ -881,6 +1116,12 @@ static void usage(const char *name)
        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");
+       printf("\t--warnings-fatal Fio parser warnings are fatal\n");
+       printf("\t--max-jobs\tMaximum number of threads/processes to support\n");
+       printf("\t--server=args\tStart a backend fio server\n");
+       printf("\t--client=hostname Talk to remove backend fio server at hostname\n");
+       printf("\nFio was written by Jens Axboe <jens.axboe@oracle.com>");
+       printf("\n                   Jens Axboe <jaxboe@fusionio.com>\n");
 }
 
 #ifdef FIO_INC_DEBUG
@@ -895,6 +1136,10 @@ struct debug_level debug_levels[] = {
        { .name = "parse",      .shift = FD_PARSE },
        { .name = "diskutil",   .shift = FD_DISKUTIL },
        { .name = "job",        .shift = FD_JOB },
+       { .name = "mutex",      .shift = FD_MUTEX },
+       { .name = "profile",    .shift = FD_PROFILE },
+       { .name = "time",       .shift = FD_TIME },
+       { .name = "net",        .shift = FD_NET },
        { .name = NULL, },
 };
 
@@ -906,8 +1151,6 @@ static int set_debug(const char *string)
        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];
@@ -962,12 +1205,74 @@ static int set_debug(const char *string)
 }
 #endif
 
-static int parse_cmd_line(int argc, char *argv[])
+static void fio_options_fill_optstring(void)
+{
+       char *ostr = cmd_optstr;
+       int i, c;
+
+       c = i = 0;
+       while (l_opts[i].name) {
+               ostr[c++] = l_opts[i].val;
+               if (l_opts[i].has_arg == required_argument)
+                       ostr[c++] = ':';
+               else if (l_opts[i].has_arg == optional_argument) {
+                       ostr[c++] = ':';
+                       ostr[c++] = ':';
+               }
+               i++;
+       }
+       ostr[c] = '\0';
+}
+
+static int client_flag_set(char c)
+{
+       int i;
+
+       i = 0;
+       while (l_opts[i].name) {
+               int val = l_opts[i].val;
+
+               if (c == (val & 0xff))
+                       return (val & FIO_CLIENT_FLAG);
+
+               i++;
+       }
+
+       return 0;
+}
+
+int parse_cmd_client(void *client, char *opt)
+{
+       return fio_client_add_cmd_option(client, opt);
+}
+
+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;
+       char *ostr = cmd_optstr;
+       int daemonize_server = 0;
+       void *cur_client;
+       int backend = 0;
+
+       /*
+        * Reset optind handling, since we may call this multiple times
+        * for the backend.
+        */
+       optind = 1;
+
+       while ((c = getopt_long_only(argc, argv, ostr, l_opts, &lidx)) != -1) {
+               did_arg = 1;
+
+               if ((c & FIO_CLIENT_FLAG) || client_flag_set(c)) {
+                       if (parse_cmd_client(cur_client, argv[optind - 1])) {
+                               exit_val = 1;
+                               do_exit++;
+                               break;
+                       }
+                       c &= ~FIO_CLIENT_FLAG;
+               }
 
-       while ((c = getopt_long_only(argc, argv, "", l_opts, &lidx)) != -1) {
                switch (c) {
                case 'a':
                        smalloc_pool_size = atoi(optarg);
@@ -978,7 +1283,7 @@ static int parse_cmd_line(int argc, char *argv[])
                case 'l':
                        write_lat_log = 1;
                        break;
-               case 'w':
+               case 'b':
                        write_bw_log = 1;
                        break;
                case 'o':
@@ -993,10 +1298,17 @@ static int parse_cmd_line(int argc, char *argv[])
                        terse_output = 1;
                        break;
                case 'h':
-                       usage(argv[0]);
-                       exit(0);
+                       if (!cur_client) {
+                               usage(argv[0]);
+                               do_exit++;
+                       }
+                       break;
                case 'c':
-                       exit(fio_show_option_help(optarg));
+                       if (!cur_client) {
+                               fio_show_option_help(optarg);
+                               do_exit++;
+                       }
+                       break;
                case 's':
                        dump_cmdline = 1;
                        break;
@@ -1004,8 +1316,19 @@ static int parse_cmd_line(int argc, char *argv[])
                        read_only = 1;
                        break;
                case 'v':
-                       printf("%s\n", fio_version_string);
-                       exit(0);
+                       if (!cur_client) {
+                               log_info("fio %s\n", fio_version_string);
+                               do_exit++;
+                       }
+                       break;
+               case 'V':
+                       terse_version = atoi(optarg);
+                       if (terse_version != 2) {
+                               log_err("fio: bad terse version format\n");
+                               exit_val = 1;
+                               do_exit++;
+                       }
+                       break;
                case 'e':
                        if (!strcmp("always", optarg))
                                eta_print = FIO_ETA_ALWAYS;
@@ -1016,7 +1339,9 @@ static int parse_cmd_line(int argc, char *argv[])
                        if (set_debug(optarg))
                                do_exit++;
                        break;
-               case 'x':
+               case 'x': {
+                       size_t new_size;
+
                        if (!strcmp(optarg, "global")) {
                                log_err("fio: can't use global as only "
                                        "section\n");
@@ -1024,9 +1349,14 @@ static int parse_cmd_line(int argc, char *argv[])
                                exit_val = 1;
                                break;
                        }
-                       if (job_section)
-                               free(job_section);
-                       job_section = strdup(optarg);
+                       new_size = (nr_job_sections + 1) * sizeof(char *);
+                       job_sections = realloc(job_sections, new_size);
+                       job_sections[nr_job_sections] = strdup(optarg);
+                       nr_job_sections++;
+                       break;
+                       }
+               case 'p':
+                       exec_profile = strdup(optarg);
                        break;
                case FIO_GETOPT_JOB: {
                        const char *opt = l_opts[lidx].name;
@@ -1034,10 +1364,8 @@ static int parse_cmd_line(int argc, char *argv[])
 
                        if (!strncmp(opt, "name", 4) && td) {
                                ret = add_job(td, td->o.name ?: "fio", 0);
-                               if (ret) {
-                                       put_job(td);
+                               if (ret)
                                        return 0;
-                               }
                                td = NULL;
                        }
                        if (!td) {
@@ -1058,24 +1386,75 @@ static int parse_cmd_line(int argc, char *argv[])
                        ret = fio_cmd_option_parse(td, opt, val);
                        break;
                }
+               case 'w':
+                       warnings_fatal = 1;
+                       break;
+               case 'j':
+                       max_jobs = atoi(optarg);
+                       if (!max_jobs || max_jobs > REAL_MAX_JOBS) {
+                               log_err("fio: invalid max jobs: %d\n", max_jobs);
+                               do_exit++;
+                               exit_val = 1;
+                       }
+                       break;
+               case 'S':
+                       if (nr_clients) {
+                               log_err("fio: can't be both client and server\n");
+                               do_exit++;
+                               exit_val = 1;
+                               break;
+                       }
+                       if (optarg)
+                               fio_server_set_arg(optarg);
+                       is_backend = 1;
+                       backend = 1;
+                       break;
+               case 'D':
+                       daemonize_server = 1;
+                       break;
+               case 'C':
+                       if (is_backend) {
+                               log_err("fio: can't be both client and server\n");
+                               do_exit++;
+                               exit_val = 1;
+                               break;
+                       }
+                       if (fio_client_add(optarg, &cur_client)) {
+                               log_err("fio: failed adding client %s\n", optarg);
+                               do_exit++;
+                               exit_val = 1;
+                               break;
+                       }
+                       break;
                default:
                        do_exit++;
                        exit_val = 1;
                        break;
                }
+               if (do_exit)
+                       break;
        }
 
-       if (do_exit)
-               exit(exit_val);
+       if (do_exit) {
+               if (exit_val && !(is_backend || nr_clients))
+                       exit(exit_val);
+       }
+
+       if (nr_clients && fio_clients_connect()) {
+               do_exit++;
+               exit_val = 1;
+               return -1;
+       }
+
+       if (is_backend && backend)
+               return fio_start_server(daemonize_server);
 
        if (td) {
                if (!ret)
                        ret = add_job(td, td->o.name ?: "fio", 0);
-               if (ret)
-                       put_job(td);
        }
 
-       while (optind < argc) {
+       while (!ret && optind < argc) {
                ini_idx++;
                ini_file = realloc(ini_file, ini_idx * sizeof(char *));
                ini_file[ini_idx - 1] = strdup(argv[optind]);
@@ -1092,21 +1471,30 @@ int parse_options(int argc, char *argv[])
        f_out = stdout;
        f_err = stderr;
 
+       fio_options_fill_optstring();
        fio_options_dup_and_init(l_opts);
 
-       if (setup_thread_area())
-               return 1;
+       atexit(free_shm);
+
        if (fill_def_thread())
                return 1;
 
        job_files = parse_cmd_line(argc, argv);
 
-       for (i = 0; i < job_files; i++) {
-               if (fill_def_thread())
-                       return 1;
-               if (parse_jobs_ini(ini_file[i], i))
-                       return 1;
-               free(ini_file[i]);
+       if (job_files > 0) {
+               for (i = 0; i < job_files; i++) {
+                       if (fill_def_thread())
+                               return 1;
+                       if (nr_clients) {
+                               if (fio_clients_send_ini(ini_file[i]))
+                                       return 1;
+                               free(ini_file[i]);
+                       } else if (!is_backend) {
+                               if (parse_jobs_ini(ini_file[i], 0, i))
+                                       return 1;
+                               free(ini_file[i]);
+                       }
+               }
        }
 
        free(ini_file);
@@ -1115,10 +1503,21 @@ int parse_options(int argc, char *argv[])
        if (!thread_number) {
                if (dump_cmdline)
                        return 0;
+               if (exec_profile)
+                       return 0;
+               if (is_backend || nr_clients)
+                       return 0;
+               if (did_arg)
+                       return 0;
 
-               log_err("No jobs defined(s)\n");
-               usage(argv[0]);
-               return 1;
+               log_err("No jobs(s) defined\n\n");
+
+               if (!did_arg) {
+                       usage(argv[0]);
+                       return 1;
+               }
+
+               return 0;
        }
 
        if (def_thread.o.gtod_offload) {
@@ -1127,5 +1526,6 @@ int parse_options(int argc, char *argv[])
                fio_gtod_cpu = def_thread.o.gtod_cpu;
        }
 
+       log_info("fio %s\n", fio_version_string);
        return 0;
 }