Skip to contentSkip to conversation

Recent changes (master)

PATCH Jens Axboe 1 participant 1 message Jan 15, 2016

lore
Share & tools
lore

Jens Axboe

author
#0 lore raw

The following changes since commit 65f41ccb386850671c0651f976cd33fdfbe0644d:

t/verify-state: one more printf type fix (2016-01-13 13:17:39 -0700)

are available in the git repository at:

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

for you to fetch changes up to 543e2e9d2ebdd26449a3f07934b87c8e1ff35033:

Fix issue with termination before io_size has been reached (2016-01-14 14:44:23 -0700)

----------------------------------------------------------------
Jens Axboe (2):
io_u: ensure that we align new start offset properly for time_based Fix issue with termination before io_size has been reached

 backend.c |  2 +-
 io_u.c    | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

---

Diff of recent changes:

backend.c +1 -1
index bd94078..2078409 100644
@@ -1293,7 +1293,7 @@ static bool keep_running(struct thread_data *td)
 		if (diff < td_max_bs(td))
 			return false;
 
-		if (fio_files_done(td))
+		if (fio_files_done(td) && !td->o.io_limit)
 			return false;
 
 		return true;
io_u.c +9 -2
index 9628d5e..8d34912 100644
@@ -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;