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 d91473657f0ce8cd0378669ab85b674574cbfd40..a42ee9b857f1d1745b9425749c6360f60e25a1e1 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -1266,19 +1266,20 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts,
                char ss_buf[64];
 
                snprintf(ss_buf, sizeof(ss_buf), "%s%s:%f%s",
-                       ss->mode & __FIO_SS_IOPS ? "iops" : "bw",
-                       ss->mode & __FIO_SS_SLOPE ? "_slope" : "",
+                       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_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->mode & __FIO_SS_ATTAINED);
+               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->pct ? "%" : "");
+               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);
@@ -1294,7 +1295,7 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts,
                ** otherwise it actually points to the second element
                ** in the list
                */
-               if ((ss->mode & __FIO_SS_ATTAINED) || ss->sum_y == 0)
+               if ((ss->state & __FIO_SS_ATTAINED) || ss->sum_y == 0)
                        j = ss->head;
                else
                        j = ss->head == 0 ? ss->dur - 1 : ss->head - 1;