From 5e726d0a29b815f526f835e44afe3225522c6c20 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 14 Oct 2011 08:08:10 +0200 Subject: [PATCH] Add fio version to terse output Signed-off-by: Jens Axboe --- HOWTO | 2 +- fio.1 | 2 +- fio.h | 1 + init.c | 4 ++-- stat.c | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/HOWTO b/HOWTO index a8d5197c..34c3505a 100644 --- a/HOWTO +++ b/HOWTO @@ -1360,7 +1360,7 @@ signify that change. 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 2473b447..aa027dc1 100644 --- 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 -.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 04963cd8..df0daf64 100644 --- 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 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 5bea9488..fa71eea8 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 d310686d..d611a726 100644 --- a/stat.c +++ b/stat.c @@ -654,8 +654,8 @@ static void show_thread_status_terse(struct thread_stat *ts, 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 */ -- 2.25.1