Make sure that alias names are also valid on the command line

[fio.git] / options.c

diff --git a/options.c b/options.c
index bdb56d3e4bec652a58b8f2fe02bdb78656f62fca..2369191ca748fe3572a3b816c597431c58aac987 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1231,7 +1231,6 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .cb     = fio_clock_source_cb,
                .off1   = td_var_offset(clocksource),
                .help   = "What type of timing source to use",
-               .def    = "gettimeofday",
                .posval = {
                          { .ival = "gettimeofday",
                            .oval = CS_GTOD,
@@ -1818,6 +1817,13 @@ static struct fio_option options[FIO_MAX_OPTS] = {
                .minval = 100,
                .maxval = 1000,
        },
+       {
+               .name   = "cgroup_nodelete",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(cgroup_nodelete),
+               .help   = "Do not delete cgroups after job completion",
+               .def    = "0",
+       },
        {
                .name   = "uid",
                .type   = FIO_OPT_INT,
@@ -1835,9 +1841,10 @@ static struct fio_option options[FIO_MAX_OPTS] = {
        },
 };
 
-static void add_to_lopt(struct option *lopt, struct fio_option *o)
+static void add_to_lopt(struct option *lopt, struct fio_option *o,
+                       const char *name)
 {
-       lopt->name = (char *) o->name;
+       lopt->name = (char *) name;
        lopt->val = FIO_GETOPT_JOB;
        if (o->type == FIO_OPT_STR_SET)
                lopt->has_arg = no_argument;
@@ -1858,7 +1865,11 @@ void fio_options_dup_and_init(struct option *long_options)
 
        o = &options[0];
        while (o->name) {
-               add_to_lopt(&long_options[i], o);
+               add_to_lopt(&long_options[i], o, o->name);
+               if (o->alias) {
+                       i++;
+                       add_to_lopt(&long_options[i], o, o->alias);
+               }
 
                i++;
                o++;