Add fio version to terse output
Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/HOWTO b/HOWTO
index a8d5197..34c3505 100644
--- a/HOWTO
+++ b/HOWTO
@@ -1360,7 +1360,7 @@
Split up, the format is as follows:
- version, jobname, groupid, error
+ terse version, fio version, jobname, groupid, error
READ status:
Total IO (KB), bandwidth (KB/sec), IOPS, runtime (msec)
Submission latency: min, max, mean, deviation
diff --git a/fio.1 b/fio.1
index 2473b44..aa027dc 100644
--- a/fio.1
+++ b/fio.1
@@ -1121,7 +1121,7 @@
change. The fields are:
.P
.RS
-.B version, jobname, groupid, error
+.B terse version, fio version, jobname, groupid, error
.P
Read status:
.RS
diff --git a/fio.h b/fio.h
index 04963cd..df0daf6 100644
--- a/fio.h
+++ b/fio.h
@@ -502,6 +502,7 @@
extern int is_backend;
extern int nr_clients;
extern int log_syslog;
+extern const char fio_version_string[];
extern const fio_fp64_t def_percentile_list[FIO_IO_U_LIST_MAX_LEN];
extern struct thread_data *threads;
diff --git a/init.c b/init.c
index 5bea948..fa71eea 100644
--- a/init.c
+++ b/init.c
@@ -26,11 +26,11 @@
#include "fio_version.h"
#if FIO_PATCH > 0
-static char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \
+const char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \
__fio_stringify(FIO_MINOR) "." \
__fio_stringify(FIO_PATCH);
#else
-static char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \
+const char fio_version_string[] = __fio_stringify(FIO_MAJOR) "." \
__fio_stringify(FIO_MINOR);
#endif
diff --git a/stat.c b/stat.c
index d310686..d611a72 100644
--- a/stat.c
+++ b/stat.c
@@ -654,8 +654,8 @@
int i;
/* General Info */
- log_info("%s;%s;%d;%d", FIO_TERSE_VERSION, ts->name, ts->groupid,
- ts->error);
+ log_info("%s;%s;%s;%d;%d", FIO_TERSE_VERSION, fio_version_string,
+ ts->name, ts->groupid, ts->error);
/* Log Read Status */
show_ddir_status_terse(ts, rs, 0);
/* Log Write Status */