JSON output, code formatting changes

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index 7a35117a6f1998faae15cae2c1e3b660205470b7..68a4a27609c5fcbec66b0fe55dda7c28f95120a0 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -1255,6 +1255,53 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts,
                }
        }
 
+       /* steady state detection; move this behind json+? */
+       if (ts->ss) {
+               struct json_object *data;
+               struct json_array *iops, *bw;
+               struct steadystate_data *ss = ts->ss;
+               unsigned long long sum_iops, sum_bw;
+               double mean_iops, mean_bw;
+               int i, x;
+               char ss_buf[64];
+
+               snprintf(ss_buf, sizeof(ss_buf), "%s%s:%f%s",
+                       ss->check_iops ? "iops" : "bw",
+                       ss->check_slope ? "_slope" : "",
+                       (float) ss->limit,
+                       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->attained);
+
+               snprintf(ss_buf, sizeof(ss_buf), "%f%s", (float) ss->criterion, 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();
+               for (i = 0, sum_iops = 0, sum_bw = 0; i < ss->dur; i++) {
+                       x = (ss->head + i) % ss->dur;
+                       sum_bw += ss->bw_data[x];
+                       sum_iops += ss->iops_data[x];
+                       json_array_add_value_int(bw, ss->bw_data[x]);
+                       json_array_add_value_int(iops, ss->iops_data[x]);
+               }
+               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;
 }
 
@@ -1578,6 +1625,11 @@ void __show_run_stats(void)
                        ts->block_infos[k] = td->ts.block_infos[k];
 
                sum_thread_stats(ts, &td->ts, idx == 1);
+
+               if (td->o.ss_dur)
+                       ts->ss = &td->ss;
+               else
+                       ts->ss = NULL;
        }
 
        for (i = 0; i < nr_ts; i++) {
@@ -1965,6 +2017,7 @@ void regrow_logs(struct thread_data *td)
 {
        regrow_log(td->slat_log);
        regrow_log(td->clat_log);
+       regrow_log(td->clat_hist_log);
        regrow_log(td->lat_log);
        regrow_log(td->bw_log);
        regrow_log(td->iops_log);
@@ -2139,7 +2192,9 @@ static long add_log_sample(struct thread_data *td, struct io_log *iolog,
         * need to do.
         */
        this_window = elapsed - iolog->avg_last;
-       if (this_window < iolog->avg_msec) {
+       if (elapsed < iolog->avg_last)
+               return iolog->avg_last - elapsed;
+       else if (this_window < iolog->avg_msec) {
                int diff = iolog->avg_msec - this_window;
 
                if (inline_log(iolog) || diff > LOG_MSEC_SLACK)
@@ -2193,7 +2248,9 @@ static void add_clat_percentile_sample(struct thread_stat *ts,
 void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
                     unsigned long usec, unsigned int bs, uint64_t offset)
 {
+       unsigned long elapsed, this_window;
        struct thread_stat *ts = &td->ts;
+       struct io_log *iolog = td->clat_hist_log;
 
        td_io_u_lock(td);
 
@@ -2205,6 +2262,43 @@ void add_clat_sample(struct thread_data *td, enum fio_ddir ddir,
        if (ts->clat_percentiles)
                add_clat_percentile_sample(ts, usec, ddir);
 
+       if (iolog && iolog->hist_msec) {
+               struct io_hist *hw = &iolog->hist_window[ddir];
+
+               hw->samples++;
+               elapsed = mtime_since_now(&td->epoch);
+               if (!hw->hist_last)
+                       hw->hist_last = elapsed;
+               this_window = elapsed - hw->hist_last;
+               
+               if (this_window >= iolog->hist_msec) {
+                       unsigned int *io_u_plat;
+                       unsigned int *dst;
+
+                       /*
+                        * Make a byte-for-byte copy of the latency histogram
+                        * stored in td->ts.io_u_plat[ddir], recording it in a
+                        * log sample. Note that the matching call to free() is
+                        * located in iolog.c after printing this sample to the
+                        * log file.
+                        */
+                       io_u_plat = (unsigned int *) td->ts.io_u_plat[ddir];
+                       dst = malloc(FIO_IO_U_PLAT_NR * sizeof(unsigned int));
+                       memcpy(dst, io_u_plat,
+                               FIO_IO_U_PLAT_NR * sizeof(unsigned int));
+                       __add_log_sample(iolog, (unsigned long )dst, ddir, bs,
+                                               elapsed, offset);
+
+                       /*
+                        * Update the last time we recorded as being now, minus
+                        * any drift in time we encountered before actually
+                        * making the record.
+                        */
+                       hw->hist_last = elapsed - (this_window - iolog->hist_msec);
+                       hw->samples = 0;
+               }
+       }
+
        td_io_u_unlock(td);
 }