From: Jens Axboe <axboe@kernel.dk>
Date: Sat, 17 Mar 2012 12:03:34 +0000 (+0100)
Subject: Merge branch 'master' into gfio
X-Git-Tag: gfio-0.1~102
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=9746fdbbd89cb202ecf2ee402b79ef215390eaea;hp=-c

Merge branch 'master' into gfio
---

9746fdbbd89cb202ecf2ee402b79ef215390eaea
diff --combined backend.c
index f1e5e364,23734d59..92c46486
--- a/backend.c
+++ b/backend.c
@@@ -558,7 -558,8 +558,8 @@@ static void do_io(struct thread_data *t
  		td_set_runstate(td, TD_RUNNING);
  
  	while ((td->o.read_iolog_file && !flist_empty(&td->io_log_list)) ||
- 		(!flist_empty(&td->trim_list)) || !io_bytes_exceeded(td)) {
+ 		(!flist_empty(&td->trim_list)) || !io_bytes_exceeded(td) ||
+ 		td->o.time_based) {
  		struct timeval comp_time;
  		unsigned long bytes_done[2] = { 0, 0 };
  		int min_evts = 0;
@@@ -1629,8 -1630,8 +1630,8 @@@ int fio_backend(void
  		return 0;
  
  	if (write_bw_log) {
 -		setup_log(&agg_io_log[DDIR_READ], 0);
 -		setup_log(&agg_io_log[DDIR_WRITE], 0);
 +		setup_log(&agg_io_log[DDIR_READ], 0, IO_LOG_TYPE_BW);
 +		setup_log(&agg_io_log[DDIR_WRITE], 0, IO_LOG_TYPE_BW);
  	}
  
  	startup_mutex = fio_mutex_init(0);