summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c69f6bf)
Fixes: https://github.com/axboe/fio/issues/237
Signed-off-by: Jens Axboe <axboe@kernel.dk>
}
static void json_add_job_opts(struct json_object *root, const char *name,
}
static void json_add_job_opts(struct json_object *root, const char *name,
- struct flist_head *opt_list, bool num_jobs)
+ struct flist_head *opt_list)
{
struct json_object *dir_object;
struct flist_head *entry;
{
struct json_object *dir_object;
struct flist_head *entry;
const char *pos = "";
p = flist_entry(entry, struct print_option, list);
const char *pos = "";
p = flist_entry(entry, struct print_option, list);
- if (!num_jobs && !strcmp(p->name, "numjobs"))
- continue;
if (p->value)
pos = p->value;
json_object_add_value_string(dir_object, p->name, pos);
if (p->value)
pos = p->value;
json_object_add_value_string(dir_object, p->name, pos);
- json_add_job_opts(root, "job options", opt_list, true);
+ json_add_job_opts(root, "job options", opt_list);
add_ddir_status_json(ts, rs, DDIR_READ, root);
add_ddir_status_json(ts, rs, DDIR_WRITE, root);
add_ddir_status_json(ts, rs, DDIR_READ, root);
add_ddir_status_json(ts, rs, DDIR_WRITE, root);
json_object_add_value_int(root, "timestamp_ms", ms_since_epoch);
json_object_add_value_string(root, "time", time_buf);
global = get_global_options();
json_object_add_value_int(root, "timestamp_ms", ms_since_epoch);
json_object_add_value_string(root, "time", time_buf);
global = get_global_options();
- json_add_job_opts(root, "global options", &global->opt_list, false);
+ json_add_job_opts(root, "global options", &global->opt_list);
array = json_create_array();
json_object_add_value_array(root, "jobs", array);
}
array = json_create_array();
json_object_add_value_array(root, "jobs", array);
}