Add the file sharing bits
[fio.git] / options.c
index 9ba9ca566802eea7743b1ec9d177024d2938d6fc..27b4fb65eb1b6158763050badd5821db122f089d 100644 (file)
--- a/options.c
+++ b/options.c
@@ -28,6 +28,120 @@ static char *get_opt_postfix(const char *str)
        return strdup(p);
 }
 
+static int bs_cmp(const void *p1, const void *p2)
+{
+       const struct bssplit *bsp1 = p1;
+       const struct bssplit *bsp2 = p2;
+
+       return bsp1->perc < bsp2->perc;
+}
+
+static int str_bssplit_cb(void *data, const char *input)
+{
+       struct thread_data *td = data;
+       char *fname, *str, *p;
+       unsigned int i, perc, perc_missing;
+       unsigned int max_bs, min_bs;
+       long long val;
+
+       p = str = strdup(input);
+
+       strip_blank_front(&str);
+       strip_blank_end(str);
+
+       td->o.bssplit_nr = 4;
+       td->o.bssplit = malloc(4 * sizeof(struct bssplit));
+
+       i = 0;
+       max_bs = 0;
+       min_bs = -1;
+       while ((fname = strsep(&str, ":")) != NULL) {
+               char *perc_str;
+
+               if (!strlen(fname))
+                       break;
+
+               /*
+                * grow struct buffer, if needed
+                */
+               if (i == td->o.bssplit_nr) {
+                       td->o.bssplit_nr <<= 1;
+                       td->o.bssplit = realloc(td->o.bssplit, td->o.bssplit_nr * sizeof(struct bssplit));
+               }
+
+               perc_str = strstr(fname, "/");
+               if (perc_str) {
+                       *perc_str = '\0';
+                       perc_str++;
+                       perc = atoi(perc_str);
+                       if (perc > 100)
+                               perc = 100;
+                       else if (!perc)
+                               perc = -1;
+               } else
+                       perc = -1;
+
+               if (str_to_decimal(fname, &val, 1)) {
+                       log_err("fio: bssplit conversion failed\n");
+                       free(td->o.bssplit);
+                       return 1;
+               }
+
+               if (val > max_bs)
+                       max_bs = val;
+               if (val < min_bs)
+                       min_bs = val;
+
+               td->o.bssplit[i].bs = val;
+               td->o.bssplit[i].perc = perc;
+               i++;
+       }
+
+       td->o.bssplit_nr = i;
+
+       /*
+        * Now check if the percentages add up, and how much is missing
+        */
+       perc = perc_missing = 0;
+       for (i = 0; i < td->o.bssplit_nr; i++) {
+               struct bssplit *bsp = &td->o.bssplit[i];
+
+               if (bsp->perc == (unsigned char) -1)
+                       perc_missing++;
+               else
+                       perc += bsp->perc;
+       }
+
+       if (perc > 100) {
+               log_err("fio: bssplit percentages add to more than 100%%\n");
+               free(td->o.bssplit);
+               return 1;
+       }
+       /*
+        * If values didn't have a percentage set, divide the remains between
+        * them.
+        */
+       if (perc_missing) {
+               for (i = 0; i < td->o.bssplit_nr; i++) {
+                       struct bssplit *bsp = &td->o.bssplit[i];
+
+                       if (bsp->perc == (unsigned char) -1)
+                               bsp->perc = (100 - perc) / perc_missing;
+               }
+       }
+
+       td->o.min_bs[DDIR_READ] = td->o.min_bs[DDIR_WRITE] = min_bs;
+       td->o.max_bs[DDIR_READ] = td->o.max_bs[DDIR_WRITE] = max_bs;
+
+       /*
+        * now sort based on percentages, for ease of lookup
+        */
+       qsort(td->o.bssplit, td->o.bssplit_nr, sizeof(struct bssplit), bs_cmp);
+
+       free(p);
+       return 0;
+}
+
 static int str_rw_cb(void *data, const char *str)
 {
        struct thread_data *td = data;
@@ -74,6 +188,7 @@ static int str_prioclass_cb(void *data, unsigned int *val)
        td->ioprio &= mask;
 
        td->ioprio |= *val << IOPRIO_CLASS_SHIFT;
+       td->ioprio_set = 1;
        return 0;
 }
 
@@ -89,6 +204,7 @@ static int str_prio_cb(void *data, unsigned int *val)
        if ((td->ioprio >> IOPRIO_CLASS_SHIFT) == 0)
                td->ioprio |= IOPRIO_CLASS_BE << IOPRIO_CLASS_SHIFT;
 
+       td->ioprio_set = 1;
        return 0;
 }
 #endif
@@ -135,7 +251,6 @@ static int str_cpus_allowed_cb(void *data, const char *input)
 
        free(p);
        td->o.cpumask_set = 1;
-       exit(0);
        return 0;
 }
 #endif
@@ -269,6 +384,22 @@ static struct fio_option options[] = {
                .cb     = str_filename_cb,
                .help   = "File(s) to use for the workload",
        },
+       {
+               .name   = "lockfile",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(lockfile),
+               .help   = "Lock file when doing IO to it",
+               .parent = "filename",
+               .def    = "0",
+       },
+       {
+               .name   = "lockfile_batch",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(lockfile_batch),
+               .help   = "Number of IOs to allow per file lock",
+               .parent = "lockfile",
+               .def    = "1",
+       },
        {
                .name   = "opendir",
                .type   = FIO_OPT_STR_STORE,
@@ -311,13 +442,6 @@ 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,
@@ -328,6 +452,12 @@ static struct fio_option options[] = {
                          { .ival = "sync",
                            .help = "Use read/write",
                          },
+                         { .ival = "psync",
+                           .help = "Use pread/pwrite",
+                         },
+                         { .ival = "vsync",
+                            .help = "Use readv/writev",
+                         },
 #ifdef FIO_HAVE_LIBAIO
                          { .ival = "libaio",
                            .help = "Linux native asynchronous IO",
@@ -383,6 +513,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth),
                .help   = "Amount of IO buffers to keep in flight",
+               .minval = 1,
                .def    = "1",
        },
        {
@@ -390,12 +521,16 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth_batch),
                .help   = "Number of IO to submit in one go",
+               .parent = "iodepth",
+               .minval = 1,
+               .def    = "1",
        },
        {
                .name   = "iodepth_low",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth_low),
                .help   = "Low water mark for queuing depth",
+               .parent = "iodepth",
        },
        {
                .name   = "size",
@@ -404,6 +539,13 @@ static struct fio_option options[] = {
                .minval = 1,
                .help   = "Total size of device or files",
        },
+       {
+               .name   = "fill_device",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(fill_device),
+               .help   = "Write until an ENOSPC error occurs",
+               .def    = "0",
+       },
        {
                .name   = "filesize",
                .type   = FIO_OPT_STR_VAL,
@@ -412,6 +554,14 @@ static struct fio_option options[] = {
                .minval = 1,
                .help   = "Size of individual files",
        },
+       {
+               .name   = "offset",
+               .alias  = "fileoffset",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(start_offset),
+               .help   = "Start IO from this offset",
+               .def    = "0",
+       },
        {
                .name   = "bs",
                .alias  = "blocksize",
@@ -421,6 +571,7 @@ static struct fio_option options[] = {
                .minval = 1,
                .help   = "Block size unit",
                .def    = "4k",
+               .parent = "rw",
        },
        {
                .name   = "bsrange",
@@ -432,6 +583,14 @@ static struct fio_option options[] = {
                .off4   = td_var_offset(max_bs[DDIR_WRITE]),
                .minval = 1,
                .help   = "Set block size range (in more detail than bs)",
+               .parent = "rw",
+       },
+       {
+               .name   = "bssplit",
+               .type   = FIO_OPT_STR,
+               .cb     = str_bssplit_cb,
+               .help   = "Set a specific mix of block sizes",
+               .parent = "rw",
        },
        {
                .name   = "bs_unaligned",
@@ -439,13 +598,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(bs_unaligned),
                .help   = "Don't sector align IO buffer sizes",
-       },
-       {
-               .name   = "offset",
-               .type   = FIO_OPT_STR_VAL,
-               .off1   = td_var_offset(start_offset),
-               .help   = "Start IO from this offset",
-               .def    = "0",
+               .parent = "rw",
        },
        {
                .name   = "randrepeat",
@@ -453,12 +606,14 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(rand_repeatable),
                .help   = "Use repeatable random IO pattern",
                .def    = "1",
+               .parent = "rw",
        },
        {
                .name   = "norandommap",
                .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(norandommap),
                .help   = "Accept potential duplicate random blocks",
+               .parent = "rw",
        },
        {
                .name   = "nrfiles",
@@ -490,6 +645,14 @@ static struct fio_option options[] = {
                            .help = "Round robin select files",
                          },
                },
+               .parent = "nrfiles",
+       },
+       {
+               .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   = "fsync",
@@ -629,6 +792,10 @@ static struct fio_option options[] = {
                            .oval = VERIFY_SHA512,
                            .help = "Use sha512 checksums for verification",
                          },
+                         { .ival = "meta",
+                           .oval = VERIFY_META,
+                           .help = "Use io information",
+                         },
                          {
                            .ival = "null",
                            .oval = VERIFY_NULL,
@@ -636,12 +803,21 @@ static struct fio_option options[] = {
                          },
                },
        },
+       {
+               .name   = "do_verify",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(do_verify),
+               .help   = "Run verification stage after write",
+               .def    = "1",
+               .parent = "verify",
+       },
        {
                .name   = "verifysort",
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(verifysort),
                .help   = "Sort written verify blocks for read back",
                .def    = "1",
+               .parent = "verify",
        },
        {
                .name   = "verify_interval",
@@ -649,6 +825,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(verify_interval),
                .minval = 2 * sizeof(struct verify_header),
                .help   = "Store verify buffer header every N bytes",
+               .parent = "verify",
        },
        {
                .name   = "verify_offset",
@@ -656,12 +833,22 @@ static struct fio_option options[] = {
                .help   = "Offset verify header location by N bytes",
                .def    = "0",
                .cb     = str_verify_offset_cb, 
+               .parent = "verify",
        },
        {
                .name   = "verify_pattern",
                .type   = FIO_OPT_INT,
                .cb     = str_verify_pattern_cb,
                .help   = "Fill pattern for IO buffers",
+               .parent = "verify",
+       },
+       {
+               .name   = "verify_fatal",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(verify_fatal),
+               .def    = "0",
+               .help   = "Exit on a single verify failure, don't continue",
+               .parent = "verify",
        },
        {
                .name   = "write_iolog",
@@ -716,13 +903,6 @@ static struct fio_option options[] = {
                .help   = "Lock down this amount of memory",
                .def    = "0",
        },
-       {
-               .name   = "rwmixcycle",
-               .type   = FIO_OPT_INT,
-               .off1   = td_var_offset(rwmixcycle),
-               .help   = "Cycle period for mixed read/write workloads (msec)",
-               .def    = "500",
-       },
        {
                .name   = "rwmixread",
                .type   = FIO_OPT_INT,
@@ -739,6 +919,14 @@ static struct fio_option options[] = {
                .help   = "Percentage of mixed workload that is writes",
                .def    = "50",
        },
+       {
+               .name   = "rwmixcycle",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(rwmixcycle),
+               .help   = "Cycle period for mixed read/write workloads (msec)",
+               .def    = "500",
+               .parent = "rwmixread",
+       },
        {
                .name   = "nice",
                .type   = FIO_OPT_INT,
@@ -779,6 +967,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(thinktime_spin),
                .help   = "Start think time by spinning this amount (usec)",
                .def    = "0",
+               .parent = "thinktime",
        },
        {
                .name   = "thinktime_blocks",
@@ -786,6 +975,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(thinktime_blocks),
                .help   = "IO buffer period between 'thinktime'",
                .def    = "1",
+               .parent = "thinktime",
        },
        {
                .name   = "rate",
@@ -798,6 +988,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(ratemin),
                .help   = "Job must meet this rate or it will be shutdown",
+               .parent = "rate",
        },
        {
                .name   = "rate_iops",
@@ -810,6 +1001,7 @@ static struct fio_option options[] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(rate_iops_min),
                .help   = "Job must meet this rate or it will be shutdown",
+               .parent = "rate_iops",
        },
        {
                .name   = "ratecycle",
@@ -817,6 +1009,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(ratecycle),
                .help   = "Window average for rate limits (msec)",
                .def    = "1000",
+               .parent = "rate",
        },
        {
                .name   = "invalidate",
@@ -831,6 +1024,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(sync_io),
                .help   = "Use O_SYNC for buffered writes",
                .def    = "0",
+               .parent = "buffered",
        },
        {
                .name   = "bwavgtime",
@@ -865,6 +1059,7 @@ static struct fio_option options[] = {
                .off1   = td_var_offset(cpucycle),
                .help   = "Length of the CPU burn cycles (usecs)",
                .def    = "50000",
+               .parent = "cpuload",
        },
 #ifdef FIO_HAVE_CPU_AFFINITY
        {
@@ -939,7 +1134,7 @@ static struct fio_option options[] = {
        },
        {
                .name   = "hugepage-size",
-               .type   = FIO_OPT_STR_VAL,
+               .type   = FIO_OPT_STR_VAL_INT,
                .off1   = td_var_offset(hugepage_size),
                .help   = "When using hugepages, specify size of each page",
                .def    = __stringify(FIO_HUGE_PAGE),