Check string length of ts->description, not value

[fio.git] / options.c

diff --git a/options.c b/options.c
index f1c0ea788ddf0db28fce608ea05ec3962c92237a..48bb2a4d318fb005ac6463f5864769682bfdaddb 100644 (file)
--- a/options.c
+++ b/options.c
@@ -203,14 +203,44 @@ static int str_rw_cb(void *data, const char *str)
        char *nr = get_opt_postfix(str);
 
        td->o.ddir_seq_nr = 1;
-       if (nr) {
+       td->o.ddir_seq_add = 0;
+
+       if (!nr)
+               return 0;
+
+       if (td_random(td))
                td->o.ddir_seq_nr = atoi(nr);
-               free(nr);
+       else {
+               long long val;
+
+               if (str_to_decimal(nr, &val, 1, td)) {
+                       log_err("fio: rw postfix parsing failed\n");
+                       free(nr);
+                       return 1;
+               }
+
+               td->o.ddir_seq_add = val;
        }
 
+       free(nr);
        return 0;
 }
 
+#ifdef FIO_HAVE_LIBAIO
+static int str_libaio_cb(void *data, const char *str)
+{
+       struct thread_data *td = data;
+
+       if (!strcmp(str, "userspace_reap")) {
+               td->o.userspace_libaio_reap = 1;
+               return 0;
+       }
+
+       log_err("fio: bad libaio sub-option: %s\n", str);
+       return 1;
+}
+#endif
+
 static int str_mem_cb(void *data, const char *mem)
 {
        struct thread_data *td = data;
@@ -565,6 +595,14 @@ static char *get_next_file_name(char **ptr)
        return start;
 }
 
+static int str_hostname_cb(void *data, const char *input)
+{
+       struct thread_data *td = data;
+
+       td->o.filename = strdup(input);
+       return 0;
+}
+
 static int str_filename_cb(void *data, const char *input)
 {
        struct thread_data *td = data;
@@ -719,6 +757,17 @@ static int str_write_lat_log_cb(void *data, const char *str)
        return 0;
 }
 
+static int str_write_iops_log_cb(void *data, const char *str)
+{
+       struct thread_data *td = data;
+
+       if (str)
+               td->o.iops_log_file = strdup(str);
+
+       td->o.write_iops_log = 1;
+       return 0;
+}
+
 static int str_gtod_reduce_cb(void *data, int *il)
 {
        struct thread_data *td = data;
@@ -728,6 +777,7 @@ static int str_gtod_reduce_cb(void *data, int *il)
        td->o.disable_clat = !!val;
        td->o.disable_slat = !!val;
        td->o.disable_bw = !!val;
+       td->o.clat_percentiles = !val;
        if (val)
                td->tv_cache_mask = 63;
 
@@ -744,6 +794,20 @@ static int str_gtod_cpu_cb(void *data, long long *il)
        return 0;
 }
 
+static int str_size_cb(void *data, unsigned long long *__val)
+{
+       struct thread_data *td = data;
+       unsigned long long v = *__val;
+
+       if (parse_is_percent(v)) {
+               td->o.size = 0;
+               td->o.size_percent = -1ULL - v;
+       } else
+               td->o.size = v;
+
+       return 0;
+}
+
 static int rw_verify(struct fio_option *o, void *data)
 {
        struct thread_data *td = data;
@@ -785,9 +849,6 @@ static int kb_base_verify(struct fio_option *o, void *data)
        return 0;
 }
 
-#define __stringify_1(x)       #x
-#define __stringify(x)         __stringify_1(x)
-
 /*
  * Map of job/command line options
  */
@@ -819,6 +880,12 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .prio   = -1, /* must come after "directory" */
                .help   = "File(s) to use for the workload",
        },
+       {
+               .name   = "hostname",
+               .type   = FIO_OPT_STR_STORE,
+               .cb     = str_hostname_cb,
+               .help   = "Hostname for net IO engine",
+       },
        {
                .name   = "kb_base",
                .type   = FIO_OPT_INT,
@@ -932,6 +999,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
 #ifdef FIO_HAVE_LIBAIO
                          { .ival = "libaio",
                            .help = "Linux native asynchronous IO",
+                           .cb   = str_libaio_cb,
                          },
 #endif
 #ifdef FIO_HAVE_POSIXAIO
@@ -988,6 +1056,11 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                          { .ival = "binject",
                            .help = "binject direct inject block engine",
                          },
+#endif
+#ifdef FIO_HAVE_RDMA
+                         { .ival = "rdma",
+                           .help = "RDMA IO engine",
+                         },
 #endif
                          { .ival = "external",
                            .help = "Load external engine (append name)",
@@ -1031,8 +1104,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
        {
                .name   = "size",
                .type   = FIO_OPT_STR_VAL,
-               .off1   = td_var_offset(size),
-               .minval = 1,
+               .cb     = str_size_cb,
                .help   = "Total size of device or files",
        },
        {
@@ -1775,6 +1847,15 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .help   = "Time window over which to calculate bandwidth"
                          " (msec)",
                .def    = "500",
+               .parent = "write_bw_log",
+       },
+       {
+               .name   = "iopsavgtime",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(iops_avg_time),
+               .help   = "Time window over which to calculate IOPS (msec)",
+               .def    = "500",
+               .parent = "write_iops_log",
        },
        {
                .name   = "create_serialize",
@@ -1861,6 +1942,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
        },
        {
                .name   = "stonewall",
+               .alias  = "wait_for_previous",
                .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(stonewall),
                .help   = "Insert a hard barrier between this job and previous",
@@ -1891,12 +1973,19 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .cb     = str_write_lat_log_cb,
                .help   = "Write log of latency during run",
        },
+       {
+               .name   = "write_iops_log",
+               .type   = FIO_OPT_STR,
+               .off1   = td_var_offset(write_iops_log),
+               .cb     = str_write_iops_log_cb,
+               .help   = "Write log of IOPS during run",
+       },
        {
                .name   = "hugepage-size",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(hugepage_size),
                .help   = "When using hugepages, specify size of each page",
-               .def    = __stringify(FIO_HUGE_PAGE),
+               .def    = __fio_stringify(FIO_HUGE_PAGE),
        },
        {
                .name   = "group_reporting",
@@ -1916,6 +2005,31 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .off1   = td_var_offset(refill_buffers),
                .help   = "Refill IO buffers on every IO submit",
        },
+       {
+               .name   = "scramble_buffers",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(scramble_buffers),
+               .help   = "Slightly scramble buffers on every IO submit",
+               .def    = "1",
+       },
+       {
+               .name   = "clat_percentiles",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(clat_percentiles),
+               .help   = "Enable the reporting of completion latency percentiles",
+               .def    = "1",
+       },
+       {
+               .name   = "percentile_list",
+               .type   = FIO_OPT_FLOAT_LIST,
+               .off1   = td_var_offset(percentile_list),
+               .off2   = td_var_offset(overwrite_plist),
+               .help   = "Specify a custom list of percentiles to report",
+               .maxlen = FIO_IO_U_LIST_MAX_LEN,
+               .minfp  = 0.0,
+               .maxfp  = 100.0,
+       },
+
 #ifdef FIO_HAVE_DISK_UTIL
        {
                .name   = "disk_util",
@@ -2091,7 +2205,7 @@ void fio_keywords_init(void)
        sprintf(buf, "%lu", page_size);
        fio_keywords[0].replace = strdup(buf);
 
-       mb_memory = os_phys_mem() / page_size;
+       mb_memory = os_phys_mem() / (1024 * 1024);
        sprintf(buf, "%llu", mb_memory);
        fio_keywords[1].replace = strdup(buf);