projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix JSON_INTEGER overflow on Windows by changing datatype to 'long long'
[fio.git]
/
stat.c
diff --git
a/stat.c
b/stat.c
index f84ce5300f605736b5ef8b9556286792b2b53cd8..509c6f02875aee1c648f9e9a432b108a6aa768c8 100644
(file)
--- 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);
}
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;
{
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_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);
}
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)
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;
else
show_thread_status_normal(ts, rs);
return NULL;