Add verify trim support

[fio.git] / options.c

diff --git a/options.c b/options.c
index c9fb88625b5c2ac6754ff28bc4511c917057c74d..e255e94f78cd552f35f53e0de9080bd04f94cf27 100644 (file)
--- a/options.c
+++ b/options.c
@@ -3,7 +3,6 @@
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
-#include <getopt.h>
 #include <assert.h>
 #include <libgen.h>
 #include <fcntl.h>
@@ -251,13 +250,13 @@ static int fio_clock_source_cb(void *data, const char *str)
        return 0;
 }
 
-static int str_lockmem_cb(void fio_unused *data, unsigned long *val)
+static int str_lockmem_cb(void fio_unused *data, unsigned long long *val)
 {
        mlock_size = *val;
        return 0;
 }
 
-static int str_rwmix_read_cb(void *data, unsigned int *val)
+static int str_rwmix_read_cb(void *data, unsigned long long *val)
 {
        struct thread_data *td = data;
 
@@ -266,7 +265,7 @@ static int str_rwmix_read_cb(void *data, unsigned int *val)
        return 0;
 }
 
-static int str_rwmix_write_cb(void *data, unsigned int *val)
+static int str_rwmix_write_cb(void *data, unsigned long long *val)
 {
        struct thread_data *td = data;
 
@@ -276,7 +275,7 @@ static int str_rwmix_write_cb(void *data, unsigned int *val)
 }
 
 #ifdef FIO_HAVE_IOPRIO
-static int str_prioclass_cb(void *data, unsigned int *val)
+static int str_prioclass_cb(void *data, unsigned long long *val)
 {
        struct thread_data *td = data;
        unsigned short mask;
@@ -292,7 +291,7 @@ static int str_prioclass_cb(void *data, unsigned int *val)
        return 0;
 }
 
-static int str_prio_cb(void *data, unsigned int *val)
+static int str_prio_cb(void *data, unsigned long long *val)
 {
        struct thread_data *td = data;
 
@@ -316,7 +315,7 @@ static int str_exitall_cb(void)
 }
 
 #ifdef FIO_HAVE_CPU_AFFINITY
-static int str_cpumask_cb(void *data, unsigned int *val)
+static int str_cpumask_cb(void *data, unsigned long long *val)
 {
        struct thread_data *td = data;
        unsigned int i;
@@ -441,6 +440,16 @@ static int str_verify_cpus_allowed_cb(void *data, const char *input)
 }
 #endif
 
+#ifdef FIO_HAVE_TRIM
+static int str_verify_trim_cb(void *data, unsigned long long *val)
+{
+       struct thread_data *td = data;
+
+       td->o.trim_percentage = *val;
+       return 0;
+}
+#endif
+
 static int str_fst_cb(void *data, const char *str)
 {
        struct thread_data *td = data;
@@ -614,7 +623,7 @@ static int str_opendir_cb(void *data, const char fio_unused *str)
        return add_dir_files(td, td->o.opendir);
 }
 
-static int str_verify_offset_cb(void *data, unsigned int *off)
+static int str_verify_offset_cb(void *data, unsigned long long *off)
 {
        struct thread_data *td = data;
 
@@ -720,7 +729,7 @@ static int str_gtod_reduce_cb(void *data, int *il)
        return 0;
 }
 
-static int str_gtod_cpu_cb(void *data, int *il)
+static int str_gtod_cpu_cb(void *data, long long *il)
 {
        struct thread_data *td = data;
        int val = *il;
@@ -881,6 +890,24 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                          },
                },
        },
+       {
+               .name   = "rw_sequencer",
+               .type   = FIO_OPT_STR,
+               .off1   = td_var_offset(rw_seq),
+               .help   = "IO offset generator modifier",
+               .def    = "sequential",
+               .posval = {
+                         { .ival = "sequential",
+                           .oval = RW_SEQ_SEQ,
+                           .help = "Generate sequential offsets",
+                         },
+                         { .ival = "identical",
+                           .oval = RW_SEQ_IDENT,
+                           .help = "Generate identical offsets",
+                         },
+               },
+       },
+
        {
                .name   = "ioengine",
                .type   = FIO_OPT_STR_STORE,
@@ -1441,7 +1468,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(verify_batch),
                .help   = "Verify this number of IO blocks",
-               .parent = "verify_backlog",
+               .parent = "verify",
        },
 #ifdef FIO_HAVE_CPU_AFFINITY
        {
@@ -1451,6 +1478,39 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .help   = "Set CPUs allowed for async verify threads",
                .parent = "verify_async",
        },
+#endif
+#ifdef FIO_HAVE_TRIM
+       {
+               .name   = "trim_percentage",
+               .type   = FIO_OPT_INT,
+               .cb     = str_verify_trim_cb,
+               .maxval = 100,
+               .help   = "Number of verify blocks to discard/trim",
+               .parent = "verify",
+               .def    = "0",
+       },
+       {
+               .name   = "trim_verify_zero",
+               .type   = FIO_OPT_INT,
+               .help   = "Verify that trim/discarded blocks are returned as zeroes",
+               .off1   = td_var_offset(trim_zero),
+               .parent = "trim_percentage",
+               .def    = "1",
+       },
+       {
+               .name   = "trim_backlog",
+               .type   = FIO_OPT_STR_VAL,
+               .off1   = td_var_offset(trim_backlog),
+               .help   = "Trim after this number of blocks are written",
+               .parent = "trim_percentage",
+       },
+       {
+               .name   = "trim_backlog_batch",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(trim_batch),
+               .help   = "Trim this number of IO blocks",
+               .parent = "trim_percentage",
+       },
 #endif
        {
                .name   = "write_iolog",
@@ -1464,6 +1524,21 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .off1   = td_var_offset(read_iolog_file),
                .help   = "Playback IO pattern from file",
        },
+       {
+               .name   = "replay_no_stall",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(no_stall),
+               .def    = "0",
+               .parent = "read_iolog",
+               .help   = "Playback IO pattern file as fast as possible without stalls",
+       },
+       {
+               .name   = "replay_redirect",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(replay_redirect),
+               .parent = "read_iolog",
+               .help   = "Replay all I/O onto this device, regardless of trace device",
+       },
        {
                .name   = "exec_prerun",
                .type   = FIO_OPT_STR_STORE,