Document trim workload choices and other nits

[fio.git] / options.c

diff --git a/options.c b/options.c
index 7638afc0f8ed94b87f26ea835c2e59bce44936db..23800753aa33eeb0f094cdfa5ea6c5fa793fa3df 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1965,7 +1965,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .off3   = offsetof(struct thread_options, bs[DDIR_TRIM]),
                .minval = 1,
                .help   = "Block size unit",
-               .def    = "4k",
+               .def    = "4096",
                .parent = "rw",
                .hide   = 1,
                .interval = 512,
@@ -2295,8 +2295,26 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
        {
                .name   = "fadvise_hint",
                .lname  = "Fadvise hint",
-               .type   = FIO_OPT_BOOL,
+               .type   = FIO_OPT_STR,
                .off1   = offsetof(struct thread_options, fadvise_hint),
+               .posval = {
+                         { .ival = "0",
+                           .oval = F_ADV_NONE,
+                           .help = "Don't issue fadvise",
+                         },
+                         { .ival = "1",
+                           .oval = F_ADV_TYPE,
+                           .help = "Advise using fio IO pattern",
+                         },
+                         { .ival = "random",
+                           .oval = F_ADV_RANDOM,
+                           .help = "Advise using FADV_RANDOM",
+                         },
+                         { .ival = "sequential",
+                           .oval = F_ADV_SEQUENTIAL,
+                           .help = "Advise using FADV_SEQUENTIAL",
+                         },
+               },
                .help   = "Use fadvise() to advise the kernel on IO pattern",
                .def    = "1",
                .category = FIO_OPT_C_FILE,
@@ -2867,7 +2885,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .off1   = offsetof(struct thread_options, trim_percentage),
                .minval = 0,
                .maxval = 100,
-               .help   = "Number of verify blocks to discard/trim",
+               .help   = "Number of verify blocks to trim (i.e., discard)",
                .parent = "verify",
                .def    = "0",
                .interval = 1,
@@ -2879,7 +2897,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .name   = "trim_verify_zero",
                .lname  = "Verify trim zero",
                .type   = FIO_OPT_BOOL,
-               .help   = "Verify that trim/discarded blocks are returned as zeroes",
+               .help   = "Verify that trimmed (i.e., discarded) blocks are returned as zeroes",
                .off1   = offsetof(struct thread_options, trim_zero),
                .parent = "trim_percentage",
                .hide   = 1,
@@ -4303,6 +4321,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .name   = "steadystate_duration",
                .lname  = "Steady state duration",
                .alias  = "ss_dur",
+               .parent = "steadystate",
                .type   = FIO_OPT_STR_VAL_TIME,
                .off1   = offsetof(struct thread_options, ss_dur),
                .help   = "Stop workload upon attaining steady state for specified duration",
@@ -4316,6 +4335,7 @@ struct fio_option fio_options[FIO_MAX_OPTS] = {
                .name   = "steadystate_ramp_time",
                .lname  = "Steady state ramp time",
                .alias  = "ss_ramp",
+               .parent = "steadystate",
                .type   = FIO_OPT_STR_VAL_TIME,
                .off1   = offsetof(struct thread_options, ss_ramp_time),
                .help   = "Delay before initiation of data collection for steady state job termination testing",