Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

[fio.git] / fio.c

diff --git a/fio.c b/fio.c
index ce29c26b653ab8b5766231a35f33007f8a48cf04..7aa55a8f7839bdbb3f08f192cf4990932e4da25f 100644 (file)
--- a/fio.c
+++ b/fio.c
@@ -343,6 +343,8 @@ static int check_min_rate(struct thread_data *td, struct timeval *now,
 
 static inline int runtime_exceeded(struct thread_data *td, struct timeval *t)
 {
+       if (in_ramp_time(td))
+               return 0;
        if (!td->o.timeout)
                return 0;
        if (mtime_since(&td->epoch, t) >= td->o.timeout * 1000)
@@ -1797,8 +1799,8 @@ int exec_run(void)
                return 0;
 
        if (write_bw_log) {
-               setup_log(&agg_io_log[DDIR_READ]);
-               setup_log(&agg_io_log[DDIR_WRITE]);
+               setup_log(&agg_io_log[DDIR_READ], 0);
+               setup_log(&agg_io_log[DDIR_WRITE], 0);
        }
 
        startup_mutex = fio_mutex_init(0);