X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=645cba40b4f012096bafff178b697ecff0ec46aa;hp=781599f48724c14530e81a0e6020c100fffd1a31;hb=3d7c391dbdc56f261447b2d8ab65e74a42a20c41;hpb=755200a326a33e5e19b16dfd5e013dd98bcf1916

diff --git a/io_u.c b/io_u.c
index 781599f4..645cba40 100644
--- a/io_u.c
+++ b/io_u.c
@@ -316,6 +316,27 @@ static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
 	td->io_u_lat[index]++;
 }
 
+static struct fio_file *get_next_file(struct thread_data *td)
+{
+	unsigned int old_next_file = td->next_file;
+	struct fio_file *f;
+
+	do {
+		f = &td->files[td->next_file];
+
+		td->next_file++;
+		if (td->next_file >= td->nr_files)
+			td->next_file = 0;
+
+		if (f->fd != -1)
+			break;
+
+		f = NULL;
+	} while (td->next_file != old_next_file);
+
+	return f;
+}
+
 struct io_u *__get_io_u(struct thread_data *td)
 {
 	struct io_u *io_u = NULL;
@@ -345,8 +366,9 @@ struct io_u *__get_io_u(struct thread_data *td)
  * Return an io_u to be processed. Gets a buflen and offset, sets direction,
  * etc. The returned io_u is fully ready to be prepped and submitted.
  */
-struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
+struct io_u *get_io_u(struct thread_data *td)
 {
+	struct fio_file *f;
 	struct io_u *io_u;
 
 	io_u = __get_io_u(td);
@@ -359,6 +381,14 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 	if (io_u->file)
 		return io_u;
 
+	f = get_next_file(td);
+	if (!f) {
+		put_io_u(td, io_u);
+		return NULL;
+	}
+
+	io_u->file = f;
+
 	if (td->zone_bytes >= td->zone_size) {
 		td->zone_bytes = 0;
 		f->last_pos += td->zone_skip;