Merge branch 'erwan/clang' of https://github.com/enovance/fio

diff --combined stat.c
index 4529f6948bcb5bb64a938fdfe66a7a1b57992a21,d61692342d722db10d4d6f95b76529158fc6f653..509c6f02875aee1c648f9e9a432b108a6aa768c8
--- 1/stat.c
--- 2/stat.c
+++ b/stat.c
@@@ -497,8 -497,7 +497,8 @@@ static void show_latencies(struct threa
        show_lat_m(io_u_lat_m);
  }
  
 -void show_thread_status_normal(struct thread_stat *ts, struct group_run_stats *rs)
 +static void show_thread_status_normal(struct thread_stat *ts,
 +                                    struct group_run_stats *rs)
  {
        double usr_cpu, sys_cpu;
        unsigned long runtime;
@@@ -770,7 -769,7 +770,7 @@@ static void add_ddir_status_json(struc
        }
        json_object_add_value_int(dir_object, "bw_min", min);
        json_object_add_value_int(dir_object, "bw_max", max);
-       json_object_add_value_float(dir_object, "bw_agg", mean);
+       json_object_add_value_float(dir_object, "bw_agg", p_of_agg);
        json_object_add_value_float(dir_object, "bw_mean", mean);
        json_object_add_value_float(dir_object, "bw_dev", dev);
  }
@@@ -1013,7 -1012,7 +1013,7 @@@ struct json_object *show_thread_status(
        if (output_format == FIO_OUTPUT_TERSE)
                show_thread_status_terse(ts, rs);
        else if (output_format == FIO_OUTPUT_JSON)
 -              return(show_thread_status_json(ts, rs));
 +              return show_thread_status_json(ts, rs);
        else
                show_thread_status_normal(ts, rs);
        return NULL;