Default to terse version 3
4 will include the trim output, and we'll augment that with json output
as well. To avoid breaking anyone who's using the git pulls for their
testing, we'll default to version 3 for now.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/stat.c b/stat.c
index e29bf0c..4e00177 100644
--- a/stat.c
+++ b/stat.c
@@ -738,10 +738,8 @@
log_info("\n");
}
-#define FIO_TERSE_VERSION "3"
-
-static void show_thread_status_terse_v3(struct thread_stat *ts,
- struct group_run_stats *rs)
+static void show_thread_status_terse_v3_v4(struct thread_stat *ts,
+ struct group_run_stats *rs, int ver)
{
double io_u_dist[FIO_IO_U_MAP_NR];
double io_u_lat_u[FIO_IO_U_LAT_U_NR];
@@ -750,14 +748,15 @@
int i;
/* General Info */
- log_info("%s;%s;%s;%d;%d", FIO_TERSE_VERSION, fio_version_string,
+ log_info("%s;%s;%s;%d;%d", ver, fio_version_string,
ts->name, ts->groupid, ts->error);
/* Log Read Status */
show_ddir_status_terse(ts, rs, DDIR_READ);
/* Log Write Status */
show_ddir_status_terse(ts, rs, DDIR_WRITE);
/* Log Trim Status */
- show_ddir_status_terse(ts, rs, DDIR_TRIM);
+ if (ver == 4)
+ show_ddir_status_terse(ts, rs, DDIR_TRIM);
/* CPU Usage */
if (ts->total_run_time) {
@@ -809,8 +808,8 @@
{
if (terse_version == 2)
show_thread_status_terse_v2(ts, rs);
- else if (terse_version == 3)
- show_thread_status_terse_v3(ts, rs);
+ else if (terse_version == 3 || terse_version == 4)
+ show_thread_status_terse_v3_v4(ts, rs, terse_version);
else
log_err("fio: bad terse version!? %d\n", terse_version);
}