Add fio version to terse output

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/HOWTO b/HOWTO
index a8d5197cd58d9b4af4836a2eda1368a1cff28366..34c3505a39d561f431de2d2d76128321177cb8fc 100644 (file)
--- a/HOWTO
+++ b/HOWTO
@@ -1360,7 +1360,7 @@ signify that change.
 
 Split up, the format is as follows:
 
 
 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
        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 2473b447e42228fe61eee62fc1968fa697015d8e..aa027dc13058bbccf6bc985fa910a3d3e854922a 100644 (file)
--- a/fio.1
+++ b/fio.1
@@ -1121,7 +1121,7 @@ for some reason, this number will be incremented by 1 to signify that
 change.  The fields are:
 .P
 .RS
 change.  The fields are:
 .P
 .RS

-.B version, jobname, groupid, error
+.B terse version, fio version, jobname, groupid, error

 .P
 Read status:
 .RS
 .P
 Read status:
 .RS

diff --git a/fio.h b/fio.h
index 04963cd8b1680e6cb7062e8eb0696eba579310a9..df0daf64e605734584b7f65cda0512c1531cbcf4 100644 (file)
--- a/fio.h
+++ b/fio.h
@@ -502,6 +502,7 @@ extern int terse_version;
 extern int is_backend;
 extern int nr_clients;
 extern int log_syslog;
 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;
 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 5bea9488627f85a461c3c2709f57155b3e8248c1..fa71eea8829adb6eb77920211c524e56efaa5dfc 100644 (file)
--- a/init.c
+++ b/init.c
@@ -26,11 +26,11 @@
 #include "fio_version.h"
 
 #if FIO_PATCH > 0
 #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
                                        __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
 
                                        __fio_stringify(FIO_MINOR);
 #endif
 

diff --git a/stat.c b/stat.c
index d310686d1295fb3653a34e656efdb72c98fcfe0e..d611a7261ec1cd5515e858486d4b2549d5e289f2 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -654,8 +654,8 @@ static void show_thread_status_terse(struct thread_stat *ts,
        int i;
 
        /* General Info */
        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 */
        /* Log Read Status */
        show_ddir_status_terse(ts, rs, 0);
        /* Log Write Status */