Add cpus_allowed option
[fio.git] / options.c
index e5ee4cf4d8dff1267367d447b0a3d12638645600..db3279e13a0dba66293e36610b3f54621efdf792 100644 (file)
--- a/options.c
+++ b/options.c
@@ -27,6 +27,18 @@ static char *get_opt_postfix(const char *str)
        return strdup(p);
 }
 
+static int str_rw_cb(void *data, const char *str)
+{
+       struct thread_data *td = data;
+       char *nr = get_opt_postfix(str);
+
+       td->o.ddir_nr = 1;
+       if (nr)
+               td->o.ddir_nr = atoi(nr);
+
+       return 0;
+}
+
 static int str_mem_cb(void *data, const char *mem)
 {
        struct thread_data *td = data;
@@ -52,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;
@@ -62,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
@@ -72,27 +98,46 @@ static int str_exitall_cb(void)
        return 0;
 }
 
-static void fill_cpu_mask(os_cpu_mask_t cpumask, int cpu)
-{
 #ifdef FIO_HAVE_CPU_AFFINITY
+static int str_cpumask_cb(void *data, unsigned int *val)
+{
+       struct thread_data *td = data;
        unsigned int i;
 
-       CPU_ZERO(&cpumask);
+       CPU_ZERO(&td->o.cpumask);
 
-       for (i = 0; i < sizeof(int) * 8; i++) {
-               if ((1 << i) & cpu)
-                       CPU_SET(i, &cpumask);
-       }
-#endif
+       for (i = 0; i < sizeof(int) * 8; i++)
+               if ((1 << i) & *val)
+                       CPU_SET(*val, &td->o.cpumask);
+
+       td->o.cpumask_set = 1;
+       return 0;
 }
 
-static int str_cpumask_cb(void *data, unsigned int *val)
+static int str_cpus_allowed_cb(void *data, const char *input)
 {
        struct thread_data *td = data;
+       char *cpu, *str, *p;
 
-       fill_cpu_mask(td->o.cpumask, *val);
+       CPU_ZERO(&td->o.cpumask);
+
+       p = str = strdup(input);
+
+       strip_blank_front(&str);
+       strip_blank_end(str);
+
+       while ((cpu = strsep(&str, ",")) != NULL) {
+               if (!strlen(cpu))
+                       break;
+               CPU_SET(atoi(cpu), &td->o.cpumask);
+       }
+
+       free(p);
+       td->o.cpumask_set = 1;
+       exit(0);
        return 0;
 }
+#endif
 
 static int str_fst_cb(void *data, const char *str)
 {
@@ -203,6 +248,7 @@ static struct fio_option options[] = {
                .name   = "rw",
                .alias  = "readwrite",
                .type   = FIO_OPT_STR,
+               .cb     = str_rw_cb,
                .off1   = td_var_offset(td_ddir),
                .help   = "IO direction",
                .def    = "read",
@@ -233,6 +279,13 @@ static struct fio_option options[] = {
                          },
                },
        },
+       {
+               .name   = "fadvise_hint",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(fadvise_hint),
+               .help   = "Use fadvise() to advise the kernel on IO pattern",
+               .def    = "1",
+       },
        {
                .name   = "ioengine",
                .type   = FIO_OPT_STR_STORE,
@@ -280,6 +333,11 @@ static struct fio_option options[] = {
                          { .ival = "cpuio",
                            .help = "CPU cycler burner engine",
                          },
+#ifdef FIO_HAVE_GUASI
+                         { .ival = "guasi",
+                           .help = "GUASI IO engine",
+                         },
+#endif
                          { .ival = "external",
                            .help = "Load external engine (append name)",
                          },
@@ -452,6 +510,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",
@@ -465,26 +529,26 @@ static struct fio_option options[] = {
                            .oval = MEM_MALLOC,
                            .help = "Use malloc(3) for IO buffers",
                          },
+                         { .ival = "shm",
+                           .oval = MEM_SHM,
+                           .help = "Use shared memory segments for IO buffers",
+                         },
 #ifdef FIO_HAVE_HUGETLB
                          { .ival = "shmhuge",
                            .oval = MEM_SHMHUGE,
                            .help = "Like shm, but use huge pages",
                          },
-                         { .ival = "shm",
-                           .oval = MEM_SHM,
-                           .help = "Use shared memory segments for IO buffers",
-                         },
 #endif
+                         { .ival = "mmap",
+                           .oval = MEM_MMAP,
+                           .help = "Use mmap(2) (file or anon) for IO buffers",
+                         },
 #ifdef FIO_HAVE_HUGETLB
                          { .ival = "mmaphuge",
                            .oval = MEM_MMAPHUGE,
                            .help = "Like mmap, but use huge pages",
                          },
 #endif
-                         { .ival = "mmap",
-                           .oval = MEM_MMAP,
-                           .help = "Use mmap(2) (file or anon) for IO buffers",
-                         },
                  },
        },
        {
@@ -506,8 +570,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,
@@ -571,7 +647,7 @@ static struct fio_option options[] = {
        {
                .name   = "rwmixread",
                .type   = FIO_OPT_INT,
-               .off1   = td_var_offset(rwmixread),
+               .off1   = td_var_offset(rwmix[DDIR_READ]),
                .maxval = 100,
                .help   = "Percentage of mixed workload that is reads",
                .def    = "50",
@@ -579,7 +655,7 @@ static struct fio_option options[] = {
        {
                .name   = "rwmixwrite",
                .type   = FIO_OPT_INT,
-               .off1   = td_var_offset(rwmixwrite),
+               .off1   = td_var_offset(rwmix[DDIR_WRITE]),
                .maxval = 100,
                .help   = "Percentage of mixed workload that is writes",
                .def    = "50",
@@ -718,6 +794,12 @@ static struct fio_option options[] = {
                .cb     = str_cpumask_cb,
                .help   = "CPU affinity mask",
        },
+       {
+               .name   = "cpus_allowed",
+               .type   = FIO_OPT_STR,
+               .cb     = str_cpus_allowed_cb,
+               .help   = "Set CPUs allowed",
+       },
 #endif
        {
                .name   = "end_fsync",
@@ -752,6 +834,12 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(stonewall),
                .help   = "Insert a hard barrier between this job and previous",
        },
+       {
+               .name   = "new_group",
+               .type   = FIO_OPT_STR_SET,
+               .off1   = td_var_offset(new_group),
+               .help   = "Mark the start of a new group (for reporting)",
+       },
        {
                .name   = "thread",
                .type   = FIO_OPT_STR_SET,
@@ -783,6 +871,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,
        },
@@ -833,3 +936,41 @@ int fio_show_option_help(const char *opt)
 {
        return show_cmd_help(options, opt);
 }
+
+static void __options_mem(struct thread_data *td, int alloc)
+{
+       struct thread_options *o = &td->o;
+       struct fio_option *opt;
+       char **ptr;
+       int i;
+
+       for (i = 0, opt = &options[0]; opt->name; i++, opt = &options[i]) {
+               if (opt->type != FIO_OPT_STR_STORE)
+                       continue;
+
+               ptr = (void *) o + opt->off1;
+               if (*ptr) {
+                       if (alloc)
+                               *ptr = strdup(*ptr);
+                       else {
+                               free(*ptr);
+                               *ptr = NULL;
+                       }
+               }
+       }
+}
+
+/*
+ * dupe FIO_OPT_STR_STORE options
+ */
+void options_mem_dupe(struct thread_data *td)
+{
+       __options_mem(td, 1);
+}
+
+void options_mem_free(struct thread_data fio_unused *td)
+{
+#if 0
+       __options_mem(td, 0);
+#endif
+}