One step closer to group reporting

[fio.git] / init.c

diff --git a/init.c b/init.c
index 636e95766fb3555416da03e9a09335596729bd35..6dcd8017a1741e708f0b1234667d38f7c64ed0b1 100644 (file)
--- a/init.c
+++ b/init.c
@@ -103,6 +103,7 @@ static struct fio_option options[] = {
 #ifdef FIO_HAVE_SYSLET
                          { .ival = "syslet-rw", },
 #endif
+                         { .ival = "external", },
                          },
        },
        {
@@ -394,7 +395,7 @@ static struct fio_option options[] = {
                .name   = "thinktime_spin",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(thinktime_spin),
-               .help   = "Start thinktime by spinning this amount (usec)",
+               .help   = "Start think time by spinning this amount (usec)",
                .def    = "0",
        },
        {
@@ -529,6 +530,12 @@ static struct fio_option options[] = {
                .help   = "When using hugepages, specify size of each page",
                .def    = __stringify(FIO_HUGE_PAGE),
        },
+       {
+               .name   = "group_reporting",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(group_reporting),
+               .help   = "Do reporting on a per-group basis",
+       },
        {
                .name = NULL,
        },
@@ -580,7 +587,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
        },
        {
                .name           = "cmdhelp",
-               .has_arg        = required_argument,
+               .has_arg        = optional_argument,
                .val            = 'c',
        },
        {
@@ -590,7 +597,7 @@ static struct option long_options[FIO_JOB_OPTS + FIO_CMD_OPTS] = {
 
 static int def_timeout = 0;
 
-static char fio_version_string[] = "fio 1.11";
+static char fio_version_string[] = "fio 1.13";
 
 static char **ini_file;
 static int max_jobs = MAX_JOBS;
@@ -607,6 +614,16 @@ FILE *f_err = NULL;
 static int write_lat_log = 0;
 int write_bw_log = 0;
 
+FILE *get_f_out()
+{
+       return f_out;
+}
+
+FILE *get_f_err()
+{
+       return f_err;
+}
+
 /*
  * Return a free job structure.
  */
@@ -708,8 +725,17 @@ static void fixup_options(struct thread_data *td)
        /*
         * The low water mark cannot be bigger than the iodepth
         */
-       if (td->iodepth_low > td->iodepth || !td->iodepth_low)
-               td->iodepth_low = td->iodepth;
+       if (td->iodepth_low > td->iodepth || !td->iodepth_low) {
+               /*
+                * syslet work around - if the workload is sequential,
+                * we want to let the queue drain all the way down to
+                * avoid seeking between async threads
+                */
+               if (!strcmp(td->io_ops->name, "syslet-rw") && !td_random(td))
+                       td->iodepth_low = 1;
+               else
+                       td->iodepth_low = td->iodepth;
+       }
 
        /*
         * If batch number isn't set, default to the same as iodepth
@@ -758,6 +784,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
        if (td == &def_thread)
                return 0;
 
+       /*
+        * this will later be shared between thread for group reporting
+        */
+       td->ts = &td->__ts;
+       memset(td->ts, 0, sizeof(*td->ts));
+
        assert(td->io_ops);
 
        if (td->odirect)
@@ -824,9 +856,9 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                
        fio_sem_init(&td->mutex, 0);
 
-       td->ts.clat_stat[0].min_val = td->ts.clat_stat[1].min_val = ULONG_MAX;
-       td->ts.slat_stat[0].min_val = td->ts.slat_stat[1].min_val = ULONG_MAX;
-       td->ts.bw_stat[0].min_val = td->ts.bw_stat[1].min_val = ULONG_MAX;
+       td->ts->clat_stat[0].min_val = td->ts->clat_stat[1].min_val = ULONG_MAX;
+       td->ts->slat_stat[0].min_val = td->ts->slat_stat[1].min_val = ULONG_MAX;
+       td->ts->bw_stat[0].min_val = td->ts->bw_stat[1].min_val = ULONG_MAX;
 
        if (td->stonewall && td->thread_number > 1)
                groupid++;
@@ -837,11 +869,11 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num)
                goto err;
 
        if (td->write_lat_log) {
-               setup_log(&td->ts.slat_log);
-               setup_log(&td->ts.clat_log);
+               setup_log(&td->ts->slat_log);
+               setup_log(&td->ts->clat_log);
        }
        if (td->write_bw_log)
-               setup_log(&td->ts.bw_log);
+               setup_log(&td->ts->bw_log);
 
        if (!td->name)
                td->name = strdup(jobname);
@@ -1008,11 +1040,26 @@ static int str_mem_cb(void *data, const char *mem)
        return 0;
 }
 
+/* External engines are specified by "external:name.o") */
+static const char *get_engine_name(const char *str)
+{
+       char *p = strstr(str, ":");
+
+       if (!p)
+               return str;
+
+       p++;
+       strip_blank_front(&p);
+       strip_blank_end(p);
+       return p;
+}
+
 static int str_ioengine_cb(void *data, const char *str)
 {
        struct thread_data *td = data;
+       const char *name = get_engine_name(str);
 
-       td->io_ops = load_ioengine(td, str);
+       td->io_ops = load_ioengine(td, name);
        if (td->io_ops)
                return 0;
 
@@ -1188,7 +1235,7 @@ static int parse_cmd_line(int argc, char *argv[])
        struct thread_data *td = NULL;
        int c, ini_idx = 0, lidx, ret, dont_add_job = 0;
 
-       while ((c = getopt_long(argc, argv, "", long_options, &lidx)) != -1) {
+       while ((c = getopt_long_only(argc, argv, "", long_options, &lidx)) != -1) {
                switch (c) {
                case 't':
                        def_timeout = atoi(optarg);