Rework fio_generate_plots script

[fio.git] / options.c

diff --git a/options.c b/options.c
index 3b04ffae8c129a6828add9cd75a28a22f451b96c..d0c53b6c988ed3ee3d61a774eee595091478a6e9 100644 (file)
--- a/options.c
+++ b/options.c
@@ -376,6 +376,23 @@ static int str_rwmix_write_cb(void *data, unsigned long long *val)
        return 0;
 }
 
+static int str_perc_rand_cb(void *data, unsigned long long *val)
+{
+       struct thread_data *td = data;
+
+       td->o.perc_rand = *val;
+       return 0;
+}
+
+static int str_perc_seq_cb(void *data, unsigned long long *val)
+{
+       struct thread_data *td = data;
+
+       td->o.perc_rand = 100 - *val;
+       return 0;
+}
+
+
 static int str_exitall_cb(void)
 {
        exitall_on_terminate = 1;
@@ -805,7 +822,7 @@ static int str_verify_pattern_cb(void *data, const char *input)
 {
        struct thread_data *td = data;
        long off;
-       int i = 0, j = 0, len, k, base = 10;
+       int i = 0, j = 0, len, k, base = 10, pattern_length;
        char *loc1, *loc2;
 
        loc1 = strstr(input, "0x");
@@ -844,10 +861,23 @@ static int str_verify_pattern_cb(void *data, const char *input)
         * Fill the pattern all the way to the end. This greatly reduces
         * the number of memcpy's we have to do when verifying the IO.
         */
+       pattern_length = i;
        while (i > 1 && i * 2 <= MAX_PATTERN_SIZE) {
                memcpy(&td->o.verify_pattern[i], &td->o.verify_pattern[0], i);
                i *= 2;
        }
+
+       /*
+        * Fill remainder, if the pattern multiple ends up not being
+        * MAX_PATTERN_SIZE.
+        */
+       while (i > 1 && i < MAX_PATTERN_SIZE) {
+               unsigned int b = min(pattern_length, MAX_PATTERN_SIZE - i);
+
+               memcpy(&td->o.verify_pattern[i], &td->o.verify_pattern[0], b);
+               i += b;
+       }
+
        if (i == 1) {
                /*
                 * The code in verify_io_u_pattern assumes a single byte pattern
@@ -1272,6 +1302,11 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                          { .ival = "vsync",
                            .help = "Use readv/writev",
                          },
+#ifdef CONFIG_PWRITEV
+                         { .ival = "pvsync",
+                           .help = "Use preadv/pwritev",
+                         },
+#endif
 #ifdef CONFIG_LIBAIO
                          { .ival = "libaio",
                            .help = "Linux native asynchronous IO",
@@ -1629,6 +1664,32 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .category = FIO_OPT_C_IO,
                .group  = FIO_OPT_G_RANDOM,
        },
+       {
+               .name   = "percentage_random",
+               .lname  = "Percentage Random",
+               .type   = FIO_OPT_INT,
+               .cb     = str_perc_rand_cb,
+               .maxval = 100,
+               .help   = "Percentage of seq/random mix that should be random",
+               .def    = "100",
+               .interval = 5,
+               .inverse = "percentage_sequential",
+               .category = FIO_OPT_C_IO,
+               .group  = FIO_OPT_G_RANDOM,
+       },
+       {
+               .name   = "percentage_sequential",
+               .lname  = "Percentage Sequential",
+               .type   = FIO_OPT_INT,
+               .cb     = str_perc_seq_cb,
+               .maxval = 100,
+               .help   = "Percentage of seq/random mix that should be sequential",
+               .def    = "0",
+               .interval = 5,
+               .inverse = "percentage_random",
+               .category = FIO_OPT_C_IO,
+               .group  = FIO_OPT_G_RANDOM,
+       },
        {
                .name   = "nrfiles",
                .lname  = "Number of files",
@@ -2763,7 +2824,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
        {
                .name   = "group_reporting",
                .lname  = "Group reporting",
-               .type   = FIO_OPT_BOOL,
+               .type   = FIO_OPT_STR_SET,
                .off1   = td_var_offset(group_reporting),
                .help   = "Do reporting on a per-group basis",
                .category = FIO_OPT_C_STAT,