Autodetect cgroup blkio mount point

[fio.git] / options.c

diff --git a/options.c b/options.c
index 4544378eb16e6a0aa187eb7f303c1f63457f4ec7..16908a07710a5e525ba666aa82fa4235c3f6c3c0 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1714,6 +1714,32 @@ static struct fio_option options[] = {
                .help   = "Continue on non-fatal errors during I/O",
                .def    = "0",
        },
+       {
+               .name   = "profile",
+               .type   = FIO_OPT_STR,
+               .off1   = td_var_offset(profile),
+               .posval = {
+                         { .ival = "tiobench",
+                           .oval = PROFILE_TIOBENCH,
+                           .help = "Perform tiobench like test",
+                         },
+               },
+               .help   = "Select a specific builtin performance test",
+       },
+       {
+               .name   = "cgroup",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(cgroup),
+               .help   = "Add job to cgroup of this name",
+       },
+       {
+               .name   = "cgroup_weight",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(cgroup_weight),
+               .help   = "Use given weight for cgroup",
+               .minval = 100,
+               .maxval = 1000,
+       },
        {
                .name = NULL,
        },
@@ -1811,6 +1837,7 @@ static char *bc_calc(char *str)
                return str;
 
        tmp++;
+       memset(opt, 0, sizeof(opt));
        strncpy(opt, str, tmp - str);
 
        buf = malloc(128);
@@ -1879,7 +1906,7 @@ static char *fio_keyword_replace(char *opt)
                         * replace opt and free the old opt
                         */
                        opt = new;
-                       free(o_org);
+                       //free(o_org);
 
                        /*
                         * Check for potential math and invoke bc, if possible