projects / fio.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add support for giving bw/clat/slat log prefixes
[fio.git] / options.c
diff --git a/options.c b/options.c
index 5aad00501c42b124cf9a7198c45aba5769c9baa2..b890420f4e4e06c75f0c8f0c787f9c4597fd844f 100644 (file)
--- a/options.c
+++ b/options.c
@@ -12,7 +12,7 @@
 
 #include "fio.h"
 #include "parse.h"
-#include "fls.h"
+#include "lib/fls.h"
 
 #define td_var_offset(var)     ((size_t) &((struct thread_options *)0)->var)
 
@@ -154,8 +154,10 @@ static int str_rw_cb(void *data, const char *str)
        char *nr = get_opt_postfix(str);
 
        td->o.ddir_nr = 1;
-       if (nr)
+       if (nr) {
                td->o.ddir_nr = atoi(nr);
+               free(nr);
+       }
 
        return 0;
 }
@@ -285,8 +287,10 @@ static int str_fst_cb(void *data, const char *str)
        char *nr = get_opt_postfix(str);
 
        td->file_service_nr = 1;
-       if (nr)
+       if (nr) {
                td->file_service_nr = atoi(nr);
+               free(nr);
+       }
 
        return 0;
 }
@@ -406,7 +410,7 @@ static int str_verify_pattern_cb(void *data, unsigned int *off)
        struct thread_data *td = data;
        unsigned int msb;
 
-       msb = fls(*off);
+       msb = __fls(*off);
        if (msb <= 8)
                td->o.verify_pattern_bytes = 1;
        else if (msb <= 16)
@@ -426,8 +430,46 @@ static int str_lockfile_cb(void *data, const char *str)
        char *nr = get_opt_postfix(str);
 
        td->o.lockfile_batch = 1;
-       if (nr)
+       if (nr) {
                td->o.lockfile_batch = atoi(nr);
+               free(nr);
+       }
+
+       return 0;
+}
+
+static int str_write_bw_log_cb(void *data, const char *str)
+{
+       struct thread_data *td = data;
+
+       if (str)
+               td->o.bw_log_file = strdup(str);
+
+       td->o.write_bw_log = 1;
+       return 0;
+}
+
+static int str_write_lat_log_cb(void *data, const char *str)
+{
+       struct thread_data *td = data;
+
+       if (str)
+               td->o.lat_log_file = strdup(str);
+
+       td->o.write_lat_log = 1;
+       return 0;
+}
+
+static int str_gtod_reduce_cb(void *data, int *il)
+{
+       struct thread_data *td = data;
+       int val = *il;
+
+       td->o.disable_clat = !!val;
+       td->o.disable_slat = !!val;
+       td->o.disable_bw = !!val;
+       if (val)
+               td->tv_cache_mask = 63;
 
        return 0;
 }
@@ -463,6 +505,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_STR_STORE,
                .off1   = td_var_offset(filename),
                .cb     = str_filename_cb,
+               .prio   = 1, /* must come before "directory" */
                .help   = "File(s) to use for the workload",
        },
        {
@@ -556,6 +599,11 @@ static struct fio_option options[] = {
                          { .ival = "posixaio",
                            .help = "POSIX asynchronous IO",
                          },
+#endif
+#ifdef FIO_HAVE_SOLARISAIO
+                         { .ival = "solarisaio",
+                           .help = "Solaris native asynchronous IO",
+                         },
 #endif
                          { .ival = "mmap",
                            .help = "Memory mapped IO",
@@ -607,6 +655,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "iodepth_batch",
+               .alias  = "iodepth_batch_submit",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth_batch),
                .help   = "Number of IO to submit in one go",
@@ -614,6 +663,15 @@ static struct fio_option options[] = {
                .minval = 1,
                .def    = "1",
        },
+       {
+               .name   = "iodepth_batch_complete",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(iodepth_batch_complete),
+               .help   = "Number of IO to retrieve in one go",
+               .parent = "iodepth",
+               .minval = 0,
+               .def    = "1",
+       },
        {
                .name   = "iodepth_low",
                .type   = FIO_OPT_INT,
@@ -708,7 +766,7 @@ static struct fio_option options[] = {
                .name   = "softrandommap",
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(softrandommap),
-               .help   = "Allow randommap to fail and continue witout",
+               .help   = "Set norandommap if randommap allocation fails",
                .parent = "norandommap",
                .def    = "0",
        },
@@ -815,6 +873,12 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(time_based),
                .help   = "Keep running until runtime/timeout is met",
        },
+       {
+               .name   = "ramp_time",
+               .type   = FIO_OPT_STR_VAL_TIME,
+               .off1   = td_var_offset(ramp_time),
+               .help   = "Ramp up time before measuring performance",
+       },
        {
                .name   = "mem",
                .alias  = "iomem",
@@ -873,6 +937,14 @@ static struct fio_option options[] = {
                            .oval = VERIFY_CRC32,
                            .help = "Use crc32 checksums for verification",
                          },
+                         { .ival = "crc32c-intel",
+                           .oval = VERIFY_CRC32C_INTEL,
+                           .help = "Use hw crc32c checksums for verification",
+                         },
+                         { .ival = "crc32c",
+                           .oval = VERIFY_CRC32C,
+                           .help = "Use crc32c checksums for verification",
+                         },
                          { .ival = "crc16",
                            .oval = VERIFY_CRC16,
                            .help = "Use crc16 checksums for verification",
@@ -1216,14 +1288,16 @@ static struct fio_option options[] = {
        },
        {
                .name   = "write_bw_log",
-               .type   = FIO_OPT_STR_SET,
+               .type   = FIO_OPT_STR,
                .off1   = td_var_offset(write_bw_log),
+               .cb     = str_write_bw_log_cb,
                .help   = "Write log of bandwidth during run",
        },
        {
                .name   = "write_lat_log",
-               .type   = FIO_OPT_STR_SET,
+               .type   = FIO_OPT_STR,
                .off1   = td_var_offset(write_lat_log),
+               .cb     = str_write_lat_log_cb,
                .help   = "Write log of latency during run",
        },
        {
@@ -1256,10 +1330,41 @@ static struct fio_option options[] = {
                .name   = "disk_util",
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(do_disk_util),
-               .help   = "Log disk utilization stats",
+               .help   = "Log disk utilization statistics",
                .def    = "1",
        },
 #endif
+       {
+               .name   = "gtod_reduce",
+               .type   = FIO_OPT_BOOL,
+               .help   = "Greatly reduce number of gettimeofday() calls",
+               .cb     = str_gtod_reduce_cb,
+               .def    = "0",
+       },
+       {
+               .name   = "disable_clat",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(disable_clat),
+               .help   = "Disable completion latency numbers",
+               .parent = "gtod_reduce",
+               .def    = "0",
+       },
+       {
+               .name   = "disable_slat",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(disable_slat),
+               .help   = "Disable submissionn latency numbers",
+               .parent = "gtod_reduce",
+               .def    = "0",
+       },
+       {
+               .name   = "disable_bw_measurement",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(disable_bw),
+               .help   = "Disable bandwidth logging",
+               .parent = "gtod_reduce",
+               .def    = "0",
+       },
        {
                .name = NULL,
        },
@@ -1291,9 +1396,16 @@ void fio_options_dup_and_init(struct option *long_options)
        }
 }
 
-int fio_option_parse(struct thread_data *td, const char *opt)
+int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
 {
-       return parse_option(opt, options, td);
+       int i, ret;
+
+       sort_options(opts, options, num_opts);
+
+       for (ret = 0, i = 0; i < num_opts; i++)
+               ret |= parse_option(opts[i], options, td);
+
+       return ret;
 }
 
 int fio_cmd_option_parse(struct thread_data *td, const char *opt, char *val)
fio - Flexible IO Tester