First snapshot of FIO for Windows

[fio.git] / options.c

diff --git a/options.c b/options.c
index 10e58dbad5caad8c56be621c2df57fe5e3e4ed29..ae5bcc5bca06f409132b474e11555dce5c0f8c1f 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;
@@ -913,7 +922,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                            .help = "Use pread/pwrite",
                          },
                          { .ival = "vsync",
-                            .help = "Use readv/writev",
+                           .help = "Use readv/writev",
                          },
 #ifdef FIO_HAVE_LIBAIO
                          { .ival = "libaio",
@@ -930,9 +939,14 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                            .help = "Solaris native asynchronous IO",
                          },
 #endif
+#ifdef FIO_HAVE_WINDOWSAIO
+                         { .ival = "windowsaio",
+                               .help = "Windows native asynchronous IO"
+                         },
                          { .ival = "mmap",
-                           .help = "Memory mapped IO",
+                           .help = "Memory mapped IO"
                          },
+#endif
 #ifdef FIO_HAVE_SPLICE
                          { .ival = "splice",
                            .help = "splice/vmsplice based IO",
@@ -958,12 +972,17 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                          },
 #endif
                          { .ival = "cpuio",
-                           .help = "CPU cycler burner engine",
+                           .help = "CPU cycle burner engine",
                          },
 #ifdef FIO_HAVE_GUASI
                          { .ival = "guasi",
                            .help = "GUASI IO engine",
                          },
+#endif
+#ifdef FIO_HAVE_BINJECT
+                         { .ival = "binject",
+                           .help = "binject direct inject block engine",
+                         },
 #endif
                          { .ival = "external",
                            .help = "Load external engine (append name)",
@@ -974,7 +993,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .name   = "iodepth",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(iodepth),
-               .help   = "Amount of IO buffers to keep in flight",
+               .help   = "Number of IO buffers to keep in flight",
                .minval = 1,
                .def    = "1",
        },
@@ -1107,6 +1126,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
        },
        {
                .name   = "nrfiles",
+               .alias  = "nr_files",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(nr_files),
                .help   = "Split job workload between this number of files",
@@ -1171,6 +1191,13 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .help   = "Issue fdatasync for writes every given number of blocks",
                .def    = "0",
        },
+       {
+               .name   = "write_barrier",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(barrier_blocks),
+               .help   = "Make every Nth write a barrier write",
+               .def    = "0",
+       },
 #ifdef FIO_HAVE_SYNC_FILE_RANGE
        {
                .name   = "sync_file_range",
@@ -1459,7 +1486,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
        {
@@ -1469,6 +1496,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",
@@ -1482,6 +1542,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,
@@ -1620,7 +1695,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(rate_iops_min[0]),
                .off2   = td_var_offset(rate_iops_min[1]),
-               .help   = "Job must meet this rate or it will be shutdown",
+               .help   = "Job must meet this rate or it will be shut down",
                .parent = "rate_iops",
        },
        {
@@ -1665,7 +1740,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .name   = "create_fsync",
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(create_fsync),
-               .help   = "Fsync file after creation",
+               .help   = "fsync file after creation",
                .def    = "1",
        },
        {
@@ -1679,7 +1754,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .name   = "pre_read",
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(pre_read),
-               .help   = "Preread files before starting official testing",
+               .help   = "Pre-read files before starting official testing",
                .def    = "0",
        },
        {
@@ -1830,7 +1905,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .name   = "disable_slat",
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(disable_slat),
-               .help   = "Disable submissionn latency numbers",
+               .help   = "Disable submission latency numbers",
                .parent = "gtod_reduce",
                .def    = "0",
        },
@@ -1846,14 +1921,14 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .name   = "gtod_cpu",
                .type   = FIO_OPT_INT,
                .cb     = str_gtod_cpu_cb,
-               .help   = "Setup dedicated gettimeofday() thread on this CPU",
+               .help   = "Set up dedicated gettimeofday() thread on this CPU",
                .verify = gtod_cpu_verify,
        },
        {
                .name   = "continue_on_error",
                .type   = FIO_OPT_BOOL,
                .off1   = td_var_offset(continue_on_error),
-               .help   = "Continue on non-fatal errors during I/O",
+               .help   = "Continue on non-fatal errors during IO",
                .def    = "0",
        },
        {