X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=stat.c;h=509c6f02875aee1c648f9e9a432b108a6aa768c8;hb=ee2e5717d1df0c37279eb94876777ee43d403e58;hp=f84ce5300f605736b5ef8b9556286792b2b53cd8;hpb=4e59d0f3a3ff569bddb31fe6927a9faf204ae9bf;p=fio.git diff --git a/stat.c b/stat.c index f84ce530..509c6f02 100644 --- a/stat.c +++ b/stat.c @@ -497,7 +497,8 @@ static void show_latencies(struct thread_stat *ts) 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; @@ -769,7 +770,7 @@ static void add_ddir_status_json(struct thread_stat *ts, } 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); } @@ -1012,7 +1013,7 @@ struct json_object *show_thread_status(struct thread_stat *ts, 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;