X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=stat.c;h=db4a387299bbd84badba2f59d02eca4d703bbf73;hb=e28dd2cfa734e26163532d24f1e06708cad659a6;hp=bae33385a23c61fa61c8815c0dcd679c8fdab8a8;hpb=bf2921f02651653c6fd6794449b725b138f2611c;p=fio.git diff --git a/stat.c b/stat.c index bae33385..db4a3872 100644 --- a/stat.c +++ b/stat.c @@ -504,7 +504,7 @@ static void show_thread_status_normal(struct thread_stat *ts, unsigned long runtime; double io_u_dist[FIO_IO_U_MAP_NR]; time_t time_p; - char time_buf[64]; + char time_buf[32]; if (!ddir_rw_sum(ts->io_bytes) && !ddir_rw_sum(ts->total_io_u)) return; @@ -1189,7 +1189,6 @@ void __show_run_stats(void) int unit_base_warned = 0; struct json_object *root = NULL; struct json_array *array = NULL; - runstats = malloc(sizeof(struct group_run_stats) * (groupid + 1)); for (i = 0; i < groupid + 1; i++) @@ -1351,8 +1350,18 @@ void __show_run_stats(void) if (output_format == FIO_OUTPUT_NORMAL) log_info("\n"); else if (output_format == FIO_OUTPUT_JSON) { + char time_buf[32]; + time_t time_p; + + time(&time_p); + os_ctime_r((const time_t *) &time_p, time_buf, + sizeof(time_buf)); + time_buf[strlen(time_buf) - 1] = '\0'; + root = json_create_object(); json_object_add_value_string(root, "fio version", fio_version_string); + json_object_add_value_int(root, "timestamp", time_p); + json_object_add_value_string(root, "time", time_buf); array = json_create_array(); json_object_add_value_array(root, "jobs", array); }