io_u: ensure that we align new start offset properly for time_based

[fio.git] / io_u.c

diff --git a/io_u.c b/io_u.c
index d45a6f010a92f31b2f27f55777e61c17348dc5b5..8d3491281ddebd665b9cc294b87b324e7bd1d4b7 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -285,8 +285,15 @@ static int get_next_seq_offset(struct thread_data *td, struct fio_file *f,
        assert(ddir_rw(ddir));
 
        if (f->last_pos[ddir] >= f->io_size + get_start_offset(td, f) &&
-           o->time_based)
-               f->last_pos[ddir] = f->last_pos[ddir] - f->io_size;
+           o->time_based) {
+               struct thread_options *o = &td->o;
+               uint64_t io_size = f->io_size + (f->io_size % o->min_bs[ddir]);
+
+               if (io_size > f->last_pos[ddir])
+                       f->last_pos[ddir] = 0;
+               else
+                       f->last_pos[ddir] = f->last_pos[ddir] - io_size;
+       }
 
        if (f->last_pos[ddir] < f->real_file_size) {
                uint64_t pos;
@@ -542,8 +549,10 @@ static inline enum fio_ddir get_rand_ddir(struct thread_data *td)
        return DDIR_WRITE;
 }
 
-void io_u_quiesce(struct thread_data *td)
+int io_u_quiesce(struct thread_data *td)
 {
+       int completed = 0;
+
        /*
         * We are going to sleep, ensure that we flush anything pending as
         * not to skew our latency numbers.
@@ -563,7 +572,11 @@ void io_u_quiesce(struct thread_data *td)
                int fio_unused ret;
 
                ret = io_u_queued_complete(td, 1);
+               if (ret > 0)
+                       completed += ret;
        }
+
+       return completed;
 }
 
 static enum fio_ddir rate_ddir(struct thread_data *td, enum fio_ddir ddir)
@@ -1553,7 +1566,7 @@ struct io_u *get_io_u(struct thread_data *td)
 out:
        assert(io_u->file);
        if (!td_io_prep(td, io_u)) {
-               if (!td->o.disable_slat)
+               if (!td->o.disable_lat)
                        fio_gettime(&io_u->start_time, NULL);
                if (do_scramble)
                        small_content_scramble(io_u);
@@ -1599,8 +1612,8 @@ void io_u_log_error(struct thread_data *td, struct io_u *io_u)
 
 static inline bool gtod_reduce(struct thread_data *td)
 {
-       return td->o.disable_clat && td->o.disable_lat && td->o.disable_slat
-               && td->o.disable_bw;
+       return (td->o.disable_clat && td->o.disable_slat && td->o.disable_bw)
+                       || td->o.gtod_reduce;
 }
 
 static void account_io_completion(struct thread_data *td, struct io_u *io_u,
@@ -1856,7 +1869,7 @@ int io_u_queued_complete(struct thread_data *td, int min_evts)
        for (ddir = DDIR_READ; ddir < DDIR_RWDIR_CNT; ddir++)
                td->bytes_done[ddir] += icd.bytes_done[ddir];
 
-       return 0;
+       return ret;
 }
 
 /*