First stab at adding job options to json output

[fio.git] / options.c

diff --git a/options.c b/options.c
index caa00af8f5e1dcf9c74c24ef8c1a4b1ea344e5d8..964e2634b5dd16c1af4cd1233019d9a1a63bd752 100644 (file)
--- a/options.c
+++ b/options.c
@@ -4081,20 +4081,16 @@ static void show_closest_option(const char *opt)
 
 int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
 {
 
 int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
 {

-       struct flist_head *opt_list = NULL;

        int i, ret, unknown;
        char **opts_copy;
 
        int i, ret, unknown;
        char **opts_copy;
 

-       if (!is_def_thread(td))
-               opt_list = &td->opt_list;
-

        sort_options(opts, fio_options, num_opts);
        opts_copy = dup_and_sub_options(opts, num_opts);
 
        for (ret = 0, i = 0, unknown = 0; i < num_opts; i++) {
                struct fio_option *o;
                int newret = parse_option(opts_copy[i], opts[i], fio_options,
        sort_options(opts, fio_options, num_opts);
        opts_copy = dup_and_sub_options(opts, num_opts);
 
        for (ret = 0, i = 0, unknown = 0; i < num_opts; i++) {
                struct fio_option *o;
                int newret = parse_option(opts_copy[i], opts[i], fio_options,

-                                               &o, td, opt_list);
+                                               &o, td, &td->opt_list);

 
                if (!newret && o)
                        fio_option_mark_set(&td->o, o);
 
                if (!newret && o)
                        fio_option_mark_set(&td->o, o);


@@ -4127,7 +4123,7 @@ int fio_options_parse(struct thread_data *td, char **opts, int num_opts)
                        if (td->eo)
                                newret = parse_option(opts_copy[i], opts[i],
                                                      td->io_ops->options, &o,
                        if (td->eo)
                                newret = parse_option(opts_copy[i], opts[i],
                                                      td->io_ops->options, &o,

-                                                     td->eo, opt_list);
+                                                     td->eo, &td->opt_list);

 
                        ret |= newret;
                        if (!o) {
 
                        ret |= newret;
                        if (!o) {