Include 'numjobs' in global options output

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 3a014d6c1aa8f8e7f10690bf09caba68396e52d8..bd2c27d0ec75abfa0de5e1b017ec9aa7fe68d23e 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -854,12 +854,13 @@ static void show_thread_status_normal(struct thread_stat *ts,
                                        io_u_dist[1], io_u_dist[2],
                                        io_u_dist[3], io_u_dist[4],
                                        io_u_dist[5], io_u_dist[6]);
-       log_buf(out, "     issued rwt: total=%llu,%llu,%llu,"
-                                " short=%llu,%llu,%llu,"
-                                " dropped=%llu,%llu,%llu\n",
+       log_buf(out, "     issued rwts: total=%llu,%llu,%llu,%llu"
+                                " short=%llu,%llu,%llu,0"
+                                " dropped=%llu,%llu,%llu,0\n",
                                        (unsigned long long) ts->total_io_u[0],
                                        (unsigned long long) ts->total_io_u[1],
                                        (unsigned long long) ts->total_io_u[2],
+                                       (unsigned long long) ts->total_io_u[3],
                                        (unsigned long long) ts->short_io_u[0],
                                        (unsigned long long) ts->short_io_u[1],
                                        (unsigned long long) ts->short_io_u[2],
@@ -1048,6 +1049,7 @@ static void add_ddir_status_json(struct thread_stat *ts,
 
                tmp_object = json_create_object();
                json_object_add_value_object(dir_object, "lat_ns", tmp_object);
+               json_object_add_value_int(dir_object, "total_ios", ts->total_io_u[DDIR_SYNC]);
                json_object_add_value_int(tmp_object, "min", min);
                json_object_add_value_int(tmp_object, "max", max);
                json_object_add_value_float(tmp_object, "mean", mean);
@@ -1224,7 +1226,7 @@ static void show_thread_status_terse_all(struct thread_stat *ts,
 }
 
 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;
@@ -1240,8 +1242,6 @@ static void json_add_job_opts(struct json_object *root, const char *name,
                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);
@@ -1275,7 +1275,7 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts,
        }
 
        if (opt_list)
-               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);
@@ -1609,6 +1609,8 @@ void sum_thread_stats(struct thread_stat *dst, struct thread_stat *src,
                }
        }
 
+       dst->total_io_u[DDIR_SYNC] += src->total_io_u[DDIR_SYNC];
+
        for (k = 0; k < DDIR_RWDIR_CNT; k++) {
                int m;
 
@@ -1647,6 +1649,7 @@ void init_thread_stat(struct thread_stat *ts)
                ts->bw_stat[j].min_val = -1UL;
                ts->iops_stat[j].min_val = -1UL;
        }
+       ts->sync_stat.min_val = -1UL;
        ts->groupid = -1;
 }
 
@@ -1873,7 +1876,7 @@ void __show_run_stats(void)
                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);
        }
@@ -2287,6 +2290,8 @@ void reset_io_stats(struct thread_data *td)
                }
        }
 
+       ts->total_io_u[DDIR_SYNC] = 0;
+
        for (i = 0; i < FIO_IO_U_MAP_NR; i++) {
                ts->io_u_map[i] = 0;
                ts->io_u_submit[i] = 0;