steadystate: get rid of ->ss_pct and encode this information in ->state via __FIO_SS_PCT

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 3e7ff7568ee40f11e9adbc9c04ad88af54746aaa..a42ee9b857f1d1745b9425749c6360f60e25a1e1 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -1255,34 +1255,63 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts,
                }
        }
 
-       /* s}teady state detection; move this behind json+? */
+       /* steady state detection; move this behind json+? */
        if (ts->ss) {
-               struct json_array *cache;
+               struct json_object *data;
+               struct json_array *iops, *bw;
                struct steadystate_data *ss = ts->ss;
-               int i, x;
-               char ss_option[64];
-
-               snprintf(ss_option, sizeof(ss_option), "%s%s:%f%s", 
-                       ss->check_iops ? "iops" : "bw",
-                       ss->check_slope ? "_slope" : "",
+               unsigned long long sum_iops, sum_bw;
+               double mean_iops, mean_bw;
+               int i, j, k;
+               char ss_buf[64];
+
+               snprintf(ss_buf, sizeof(ss_buf), "%s%s:%f%s",
+                       ss->state & __FIO_SS_IOPS ? "iops" : "bw",
+                       ss->state & __FIO_SS_SLOPE ? "_slope" : "",
                        (float) ss->limit,
-                       ss->pct ? "%" : "");
+                       ss->state & __FIO_SS_PCT ? "%" : "");
 
                tmp = json_create_object();
                json_object_add_value_object(root, "steadystate", tmp);
-               json_object_add_value_string(tmp, "ss", ss_option);
-               json_object_add_value_float(tmp, "limit", (float)ss->limit);
+               json_object_add_value_string(tmp, "ss", ss_buf);
                json_object_add_value_int(tmp, "duration", (int)ss->dur);
                json_object_add_value_int(tmp, "steadystate_ramptime", ss->ramp_time / 1000000L);
-               json_object_add_value_int(tmp, "attained", ss->attained);
-               json_object_add_value_float(tmp, "criterion", ss->criterion);
-
-               cache = json_create_array();
-               json_object_add_value_array(tmp, "data", cache);
-               for (i = 0; i < ss->dur; i++) {
-                       x = (ss->head + i) % ss->dur;
-                       json_array_add_value_int(cache, ss->cache[x]);
+               json_object_add_value_int(tmp, "attained", (ss->state & __FIO_SS_ATTAINED) > 0);
+
+               snprintf(ss_buf, sizeof(ss_buf), "%f%s", (float) ss->criterion,
+                       ss->state & __FIO_SS_PCT ? "%" : "");
+               json_object_add_value_string(tmp, "criterion", ss_buf);
+               json_object_add_value_float(tmp, "max_deviation", ss->deviation);
+               json_object_add_value_float(tmp, "slope", ss->slope);
+
+               data = json_create_object();
+               json_object_add_value_object(tmp, "data", data);
+               bw = json_create_array();
+               iops = json_create_array();
+
+               /*
+               ** if ss was attained or the buffer is not full,
+               ** ss->head points to the first element in the list.
+               ** otherwise it actually points to the second element
+               ** in the list
+               */
+               if ((ss->state & __FIO_SS_ATTAINED) || ss->sum_y == 0)
+                       j = ss->head;
+               else
+                       j = ss->head == 0 ? ss->dur - 1 : ss->head - 1;
+               for (i = 0, sum_iops = 0, sum_bw = 0; i < ss->dur; i++) {
+                       k = (j + i) % ss->dur;
+                       sum_bw += ss->bw_data[k];
+                       sum_iops += ss->iops_data[k];
+                       json_array_add_value_int(bw, ss->bw_data[k]);
+                       json_array_add_value_int(iops, ss->iops_data[k]);
                }
+               mean_bw = (double) sum_bw / ss->dur;
+               mean_iops = (double) sum_iops / ss->dur;
+               json_object_add_value_float(data, "bw_mean", mean_bw);
+               json_object_add_value_float(data, "iops_mean", mean_iops);
+               json_object_add_value_array(data, "iops", iops);
+               json_object_add_value_array(data, "bw", bw);
        }
 
        return root;