Add support for loadable profiles

[fio.git] / options.c

diff --git a/options.c b/options.c
index 211bca743048e5a16893634930a85b4eaa7f0e83..03b24377babde979427c4255cc451acd88b85343 100644 (file)
--- a/options.c
+++ b/options.c
@@ -14,8 +14,9 @@
 #include "verify.h"
 #include "parse.h"
 #include "lib/fls.h"
+#include "options.h"
 
-#define td_var_offset(var)     ((size_t) &((struct thread_options *)0)->var)
+static FLIST_HEAD(ext_opt_list);
 
 /*
  * Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
@@ -1081,6 +1082,15 @@ static struct fio_option options[] = {
                },
                .parent = "nrfiles",
        },
+#ifdef FIO_HAVE_FALLOCATE
+       {
+               .name   = "fallocate",
+               .type   = FIO_OPT_BOOL,
+               .off1   = td_var_offset(fallocate),
+               .help   = "Use fallocate() when laying out files",
+               .def    = "1",
+       },
+#endif
        {
                .name   = "fadvise_hint",
                .type   = FIO_OPT_BOOL,
@@ -1714,6 +1724,38 @@ static struct fio_option options[] = {
                .help   = "Continue on non-fatal errors during I/O",
                .def    = "0",
        },
+       {
+               .name   = "profile",
+               .type   = FIO_OPT_STR_STORE,
+               .off1   = td_var_offset(profile),
+               .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   = "uid",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(uid),
+               .help   = "Run job with this user ID",
+       },
+       {
+               .name   = "gid",
+               .type   = FIO_OPT_INT,
+               .off1   = td_var_offset(gid),
+               .help   = "Run job with this group ID",
+       },
        {
                .name = NULL,
        },
@@ -1771,16 +1813,15 @@ static struct fio_keyword fio_keywords[] = {
 
 void fio_keywords_init(void)
 {
-       unsigned long mb_memory;
+       unsigned long long mb_memory;
        char buf[128];
        long l;
 
        sprintf(buf, "%lu", page_size);
        fio_keywords[0].replace = strdup(buf);
 
-       l = sysconf(_SC_PHYS_PAGES);
-       mb_memory = l * (page_size / 1024UL);
-       sprintf(buf, "%lu", mb_memory);
+       mb_memory = os_phys_mem() / page_size;
+       sprintf(buf, "%llu", mb_memory);
        fio_keywords[1].replace = strdup(buf);
 
        l = sysconf(_SC_NPROCESSORS_ONLN);
@@ -1811,6 +1852,7 @@ static char *bc_calc(char *str)
                return str;
 
        tmp++;
+       memset(opt, 0, sizeof(opt));
        strncpy(opt, str, tmp - str);
 
        buf = malloc(128);
@@ -1879,14 +1921,16 @@ 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
+                        */
+                       opt = bc_calc(opt);
                }
        }
 
-       /*
-        * Check for potential math and invoke bc, if possible
-        */
-       return bc_calc(opt);
+       return opt;
 }
 
 int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
@@ -1897,7 +1941,7 @@ int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
 
        for (ret = 0, i = 0; i < num_opts; i++) {
                opts[i] = fio_keyword_replace(opts[i]);
-               ret |= parse_option(opts[i], options, td);
+               ret |= parse_option(opts[i], options, &ext_opt_list, td);
        }
 
        return ret;
@@ -1905,7 +1949,7 @@ int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
 
 int fio_cmd_option_parse(struct thread_data *td, const char *opt, char *val)
 {
-       return parse_cmd_option(opt, val, options, td);
+       return parse_cmd_option(opt, val, options, &ext_opt_list, td);
 }
 
 void fio_fill_default_options(struct thread_data *td)
@@ -1968,3 +2012,10 @@ unsigned int fio_get_kb_base(void *data)
 
        return kb_base;
 }
+
+void register_ext_option(struct ext_option *eopt)
+{
+       dprint(FD_PARSE, "register option '%s'\n", eopt->o.name);
+       option_init(&eopt->o);
+       flist_add_tail(&eopt->list, &ext_opt_list);
+}