Merge branch 'master' into gfio

[fio.git] / stat.c

diff --git a/stat.c b/stat.c
index c3d3c4ad4154d684dca4077a921a05d8d03cff54..402a73f767aaf7270e347349db8f2e939439ab16 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -734,7 +734,7 @@ static void add_ddir_status_json(struct thread_stat *ts,
        if (ovals)
                free(ovals);
 
-       if (!calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
+       if (calc_lat(&ts->bw_stat[ddir], &min, &max, &mean, &dev)) {
                if (rs->agg[ddir]) {
                        p_of_agg = mean * 100 / (double) rs->agg[ddir];
                        if (p_of_agg > 100.0)
@@ -1350,13 +1350,21 @@ static void *__show_running_run_stats(void *arg)
                if (td_trim(td) && td->io_bytes[DDIR_TRIM])
                        td->ts.runtime[DDIR_TRIM] += rt[i];
 
-               update_rusage_stat(td);
+               td->update_rusage = 1;
                td->ts.io_bytes[DDIR_READ] = td->io_bytes[DDIR_READ];
                td->ts.io_bytes[DDIR_WRITE] = td->io_bytes[DDIR_WRITE];
                td->ts.io_bytes[DDIR_TRIM] = td->io_bytes[DDIR_TRIM];
                td->ts.total_run_time = mtime_since(&td->epoch, &tv);
        }
 
+       for_each_td(td, i) {
+               if (td->rusage_sem) {
+                       td->update_rusage = 1;
+                       fio_mutex_down(td->rusage_sem);
+               }
+               td->update_rusage = 0;
+       }
+
        show_run_stats();
 
        for_each_td(td, i) {