Merge branch 'master' into gfio

diff --git a/backend.c b/backend.c
index f1e5e3646070d824e524d63a1aa3e74f55a80062..92c4648645a964ed4b3563b167c8e4036a934076 100644 (file)
--- a/backend.c
+++ b/backend.c
@@ -558,7 +558,8 @@ static void do_io(struct thread_data *td)
                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;

diff --git a/io_u.c b/io_u.c
index ba6757993a403ee34b11a222317460c4818a9dd7..a4f378d811dd87df2481db8756ee463306e44f9e 100644 (file)
--- a/io_u.c
+++ b/io_u.c
@@ -237,20 +237,28 @@ ret:
 static int get_next_rand_block(struct thread_data *td, struct fio_file *f,
                               enum fio_ddir ddir, unsigned long long *b)
 {
-       if (get_next_rand_offset(td, f, ddir, b)) {
-               dprint(FD_IO, "%s: rand offset failed, last=%llu, size=%llu\n",
-                               f->file_name, f->last_pos, f->real_file_size);
-               return 1;
+       if (!get_next_rand_offset(td, f, ddir, b))
+               return 0;
+
+       if (td->o.time_based) {
+               fio_file_reset(f);
+               if (!get_next_rand_offset(td, f, ddir, b))
+                       return 0;
        }
 
-       return 0;
+       dprint(FD_IO, "%s: rand offset failed, last=%llu, size=%llu\n",
+                       f->file_name, f->last_pos, f->real_file_size);
+       return 1;
 }
 
-static int get_next_seq_block(struct thread_data *td, struct fio_file *f,
-                             enum fio_ddir ddir, unsigned long long *b)
+static int get_next_seq_offset(struct thread_data *td, struct fio_file *f,
+                              enum fio_ddir ddir, unsigned long long *offset)
 {
        assert(ddir_rw(ddir));
 
+       if (f->last_pos >= f->io_size && td->o.time_based)
+               f->last_pos = f->last_pos - f->io_size;
+
        if (f->last_pos < f->real_file_size) {
                unsigned long long pos;
 
@@ -261,7 +269,7 @@ static int get_next_seq_block(struct thread_data *td, struct fio_file *f,
                if (pos)
                        pos += td->o.ddir_seq_add;
 
-               *b = pos / td->o.min_bs[ddir];
+               *offset = pos;
                return 0;
        }
 
@@ -269,31 +277,33 @@ static int get_next_seq_block(struct thread_data *td, struct fio_file *f,
 }
 
 static int get_next_block(struct thread_data *td, struct io_u *io_u,
-                         enum fio_ddir ddir, int rw_seq, unsigned long long *b)
+                         enum fio_ddir ddir, int rw_seq)
 {
        struct fio_file *f = io_u->file;
+       unsigned long long b, offset;
        int ret;
 
        assert(ddir_rw(ddir));
 
+       b = offset = -1ULL;
+
        if (rw_seq) {
                if (td_random(td))
-                       ret = get_next_rand_block(td, f, ddir, b);
+                       ret = get_next_rand_block(td, f, ddir, &b);
                else
-                       ret = get_next_seq_block(td, f, ddir, b);
+                       ret = get_next_seq_offset(td, f, ddir, &offset);
        } else {
                io_u->flags |= IO_U_F_BUSY_OK;
 
                if (td->o.rw_seq == RW_SEQ_SEQ) {
-                       ret = get_next_seq_block(td, f, ddir, b);
+                       ret = get_next_seq_offset(td, f, ddir, &offset);
                        if (ret)
-                               ret = get_next_rand_block(td, f, ddir, b);
+                               ret = get_next_rand_block(td, f, ddir, &b);
                } else if (td->o.rw_seq == RW_SEQ_IDENT) {
                        if (f->last_start != -1ULL)
-                               *b = (f->last_start - f->file_offset)
-                                       / td->o.min_bs[ddir];
+                               offset = f->last_start - f->file_offset;
                        else
-                               *b = 0;
+                               offset = 0;
                        ret = 0;
                } else {
                        log_err("fio: unknown rw_seq=%d\n", td->o.rw_seq);
@@ -301,6 +311,17 @@ static int get_next_block(struct thread_data *td, struct io_u *io_u,
                }
        }
        
+       if (!ret) {
+               if (offset != -1ULL)
+                       io_u->offset = offset;
+               else if (b != -1ULL)
+                       io_u->offset = b * td->o.ba[ddir];
+               else {
+                       log_err("fio: bug in offset generation\n");
+                       ret = 1;
+               }
+       }
+
        return ret;
 }
 
@@ -312,7 +333,6 @@ static int get_next_block(struct thread_data *td, struct io_u *io_u,
 static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
 {
        struct fio_file *f = io_u->file;
-       unsigned long long b;
        enum fio_ddir ddir = io_u->ddir;
        int rw_seq_hit = 0;
 
@@ -323,10 +343,9 @@ static int __get_next_offset(struct thread_data *td, struct io_u *io_u)
                td->ddir_seq_nr = td->o.ddir_seq_nr;
        }
 
-       if (get_next_block(td, io_u, ddir, rw_seq_hit, &b))
+       if (get_next_block(td, io_u, ddir, rw_seq_hit))
                return 1;
 
-       io_u->offset = b * td->o.ba[ddir];
        if (io_u->offset >= f->io_size) {
                dprint(FD_IO, "get_next_offset: offset %llu >= io_size %llu\n",
                                        io_u->offset, f->io_size);

diff --git a/t/jobs/t0007-37cf9e3c.fio b/t/jobs/t0007-37cf9e3c.fio
new file mode 100644 (file)
index 0000000..fd70c21
--- /dev/null
+++ b/t/jobs/t0007-37cf9e3c.fio
@@ -0,0 +1,10 @@
+# Expected result: fio reads 87040KB of data
+# Buggy result: fio reads the full 128MB of data
+[foo]
+size=128mb
+rw=read:512k
+bs=1m
+time_based
+norandommap
+write_iolog=log
+direct=1