Recent changes (master)

[Jens Axboe <axboe@kernel.dk>]

The following changes since commit d7658cedd1f31d1285f1f1e1cfe42fabb7cd6c8f:

  Return non-negtive error in order to print right error msg (2017-04-19 20:34:19 +0800)

are available in the git repository at:

  git://git.kernel.dk/fio.git master

for you to fetch changes up to 306fea38fa61c305703d0269b1fc8e7da3b91a1f:

  stat: make next log time decision cleaner (2017-04-25 18:14:00 -0600)

----------------------------------------------------------------
Jens Axboe (1):
      stat: make next log time decision cleaner

 stat.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

---

Diff of recent changes:

diff --git a/stat.c b/stat.c
index fde7af2..27d1fea 100644
--- a/stat.c
+++ b/stat.c
@@ -2479,9 +2479,10 @@ static int add_bw_samples(struct thread_data *td, struct timeval *t)
 	td_io_u_unlock(td);
 
 	if (spent <= td->o.bw_avg_time)
-		return min(next_log, td->o.bw_avg_time);
+		next = td->o.bw_avg_time;
+	else
+		next = td->o.bw_avg_time - (1 + spent - td->o.bw_avg_time);
 
-	next = td->o.bw_avg_time - (1 + spent - td->o.bw_avg_time);
 	return min(next, next_log);
 }
 
@@ -2554,9 +2555,10 @@ static int add_iops_samples(struct thread_data *td, struct timeval *t)
 	td_io_u_unlock(td);
 
 	if (spent <= td->o.iops_avg_time)
-		return min(next_log, td->o.iops_avg_time);
+		next = td->o.iops_avg_time;
+	else
+		next = td->o.iops_avg_time - (1 + spent - td->o.iops_avg_time);
 
-	next = td->o.iops_avg_time - (1 + spent - td->o.iops_avg_time);
 	return min(next, next_log);
 }