Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

[fio.git] / options.c

diff --git a/options.c b/options.c
index bbb30990d28ba06955ea458a3b809f463a41e79c..839af0bffbdc5f3d4e2c5c6488ef6d7debadef4b 100644 (file)
--- a/options.c
+++ b/options.c
@@ -64,6 +64,13 @@ static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
 static int str_prioclass_cb(void *data, unsigned int *val)
 {
        struct thread_data *td = data;
+       unsigned short mask;
+
+       /*
+        * mask off old class bits, str_prio_cb() may have set a default class
+        */
+       mask = (1 << IOPRIO_CLASS_SHIFT) - 1;
+       td->ioprio &= mask;
 
        td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
        return 0;
@@ -74,6 +81,13 @@ static int str_prio_cb(void *data, unsigned int *val)
        struct thread_data *td = data;
 
        td->ioprio |= *val;
+
+       /*
+        * If no class is set, assume BE
+        */
+       if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
+               td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
+
        return 0;
 }
 #endif
@@ -84,17 +98,16 @@ static int str_exitall_cb(void)
        return 0;
 }
 
-static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
+static void fill_cpu_mask(os_cpu_mask_t *cpumask, int cpu)
 {
 #ifdef FIO_HAVE_CPU_AFFINITY
        unsigned int i;
 
-       CPU_ZERO(&cpumask);
+       CPU_ZERO(cpumask);
 
-       for (i = 0; i < sizeof(int) * 8; i++) {
+       for (i = 0; i < sizeof(int) * 8; i++)
                if ((1 << i) & cpu)
-                       CPU_SET(i, &cpumask);
-       }
+                       CPU_SET(i, cpumask);
 #endif
 }
 
@@ -102,7 +115,8 @@ static int str_cpumask_cb(void *data, unsigned int *val)
 {
        struct thread_data *td = data;
 
-       fill_cpu_mask(td->o.cpumask, *val);
+       fill_cpu_mask(&td->o.cpumask, *val);
+       td->o.cpumask_set = 1;
        return 0;
 }
 
@@ -477,6 +491,12 @@ static struct fio_option options[] = {
                .help   = "Stop workload when this amount of time has passed",
                .def    = "0",
        },
+       {
+               .name   = "time_based",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(time_based),
+               .help   = "Keep running until runtime/timeout is met",
+       },
        {
                .name   = "mem",
                .alias  = "iomem",
@@ -531,8 +551,20 @@ static struct fio_option options[] = {
                            .oval = VERIFY_MD5,
                            .help = "Use md5 checksums for verification",
                          },
+                         {
+                           .ival = "null",
+                           .oval = VERIFY_NULL,
+                           .help = "Pretend to verify",
+                         },
                },
        },
+       {
+               .name   = "verifysort",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(verifysort),
+               .help   = "Sort written verify blocks for read back",
+               .def    = "1",
+       },
        {
                .name   = "write_iolog",
                .type   = FIO_OPT_STR_STORE,
@@ -814,6 +846,21 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(group_reporting),
                .help   = "Do reporting on a per-group basis",
        },
+       {
+               .name   = "zero_buffers",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(zero_buffers),
+               .help   = "Init IO buffers to all zeroes",
+       },
+#ifdef FIO_HAVE_DISK_UTIL
+       {
+               .name   = "disk_util",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(do_disk_util),
+               .help   = "Log disk utilization stats",
+               .def    = "1",
+       },
+#endif
        {
                .name = NULL,
        },
@@ -896,7 +943,9 @@ void options_mem_dupe(struct thread_data *td)
        __options_mem(td, 1);
 }
 
-void options_mem_free(struct thread_data *td)
+void options_mem_free(struct thread_data fio_unused *td)
 {
+#if 0
        __options_mem(td, 0);
+#endif
 }