projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
75dc383
)
add eta and elapsed to root of json output
author
Christopher Jacobs
<cjacobs@ocz.com>
Mon, 22 Jun 2015 21:14:50 +0000
(14:14 -0700)
committer
Christopher Jacobs
<cjacobs@ocz.com>
Mon, 22 Jun 2015 21:34:04 +0000
(14:34 -0700)
stat.c
patch
|
blob
|
blame
|
history
diff --git
a/stat.c
b/stat.c
index 30a2c1e749530c987e3efd0649d519b789ab6681..00eb75d7c6c2150254d51aa145ae97ca34679f22 100644
(file)
--- a/
stat.c
+++ b/
stat.c
@@
-1062,17
+1062,26
@@
static struct json_object *show_thread_status_json(struct thread_stat *ts,
struct group_run_stats *rs)
{
struct json_object *root, *tmp;
struct group_run_stats *rs)
{
struct json_object *root, *tmp;
+ struct jobs_eta *je;
double io_u_dist[FIO_IO_U_MAP_NR];
double io_u_lat_u[FIO_IO_U_LAT_U_NR];
double io_u_lat_m[FIO_IO_U_LAT_M_NR];
double usr_cpu, sys_cpu;
int i;
double io_u_dist[FIO_IO_U_MAP_NR];
double io_u_lat_u[FIO_IO_U_LAT_U_NR];
double io_u_lat_m[FIO_IO_U_LAT_M_NR];
double usr_cpu, sys_cpu;
int i;
+ size_t size;
+
root = json_create_object();
json_object_add_value_string(root, "jobname", ts->name);
json_object_add_value_int(root, "groupid", ts->groupid);
json_object_add_value_int(root, "error", ts->error);
root = json_create_object();
json_object_add_value_string(root, "jobname", ts->name);
json_object_add_value_int(root, "groupid", ts->groupid);
json_object_add_value_int(root, "error", ts->error);
+ /* ETA Info */
+ je = get_jobs_eta(1, &size);
+ json_object_add_value_int(root, "eta", je->eta_sec);
+ json_object_add_value_int(root, "elapsed", je->elapsed_sec);
+
+
add_ddir_status_json(ts, rs, DDIR_READ, root);
add_ddir_status_json(ts, rs, DDIR_WRITE, root);
add_ddir_status_json(ts, rs, DDIR_TRIM, root);
add_ddir_status_json(ts, rs, DDIR_READ, root);
add_ddir_status_json(ts, rs, DDIR_WRITE, root);
add_ddir_status_json(ts, rs, DDIR_TRIM, root);