From: Jens Axboe <axboe@fb.com>
Date: Tue, 1 Apr 2014 19:34:49 +0000 (-0600)
Subject: Ensure we inherit global latency/bw log settings
X-Git-Tag: fio-2.1.8~30
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=8e25577988d7454ef2fd9c030354b70adca3c57b;p=fio.git

Ensure we inherit global latency/bw log settings

Note that you cannot use a filename with these, it's just
an on/off switch. For tighter control of where the log
is written (and its name), use the job option instead of
the command line on/off switch.

Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/init.c b/init.c
index 72d106af..c7e056fa 100644
--- a/init.c
+++ b/init.c
@@ -1087,12 +1087,12 @@ static int add_job(struct thread_data *td, const char *jobname, int job_add_num,
 	if (setup_rate(td))
 		goto err;
 
-	if (o->lat_log_file) {
+	if (o->lat_log_file || write_lat_log) {
 		setup_log(&td->lat_log, o->log_avg_msec, IO_LOG_TYPE_LAT);
 		setup_log(&td->slat_log, o->log_avg_msec, IO_LOG_TYPE_SLAT);
 		setup_log(&td->clat_log, o->log_avg_msec, IO_LOG_TYPE_CLAT);
 	}
-	if (o->bw_log_file)
+	if (o->bw_log_file || write_bw_log)
 		setup_log(&td->bw_log, o->log_avg_msec, IO_LOG_TYPE_BW);
 	if (o->iops_log_file)
 		setup_log(&td->iops_log, o->log_avg_msec, IO_LOG_TYPE_IOPS);