X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=53e57b4ffe4a6bcc51907c54ac25ca2531c73d1a;hp=ab85193d1c95166dfcbd4eeea45a28637c788d4c;hb=9ff9de69348f3def14e9a5dde7401d5e760e3c7c;hpb=5945b9b45474a9a717a3db2310822aa5064fb38b

diff --git a/io_u.c b/io_u.c
index ab85193d..53e57b4f 100644
--- a/io_u.c
+++ b/io_u.c
@@ -15,7 +15,6 @@
 
 struct io_completion_data {
 	int nr;				/* input */
-	endio_handler *handler;		/* input */
 
 	int error;			/* output */
 	unsigned long bytes_done[2];	/* output */
@@ -106,7 +105,7 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
 	unsigned long long b, rb;
 	long r;
 
-	if (!td->sequential) {
+	if (td_random(td)) {
 		unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
 		int loops = 5;
 
@@ -253,7 +252,7 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
 	/*
 	 * mark entry before potentially trimming io_u
 	 */
-	if (!td->read_iolog && !td->sequential && !td->norandommap)
+	if (!td->read_iolog && td_random(td) && !td->norandommap)
 		mark_random_map(td, f, io_u);
 
 	/*
@@ -325,7 +324,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)
+/*
+ * Get next file to service by choosing one at random
+ */
+static struct fio_file *get_next_file_rand(struct thread_data *td)
+{
+	long r = os_random_long(&td->next_file_state);
+	unsigned int fileno;
+	struct fio_file *f;
+
+	do {
+		fileno = (unsigned int) ((double) (td->nr_files - 1) * r / (RAND_MAX + 1.0));
+		f = &td->files[fileno];
+		if (f->fd != -1)
+			return f;
+	} while (1);
+}
+
+/*
+ * Get next file to service by doing round robin between all available ones
+ */
+static struct fio_file *get_next_file_rr(struct thread_data *td)
 {
 	unsigned int old_next_file = td->next_file;
 	struct fio_file *f;
@@ -358,6 +377,7 @@ struct io_u *__get_io_u(struct thread_data *td)
 		io_u->buflen = 0;
 		io_u->resid = 0;
 		io_u->file = NULL;
+		io_u->end_io = NULL;
 	}
 
 	if (io_u) {
@@ -393,7 +413,11 @@ struct io_u *get_io_u(struct thread_data *td)
 	if (io_u->file)
 		goto out;
 
-	f = get_next_file(td);
+	if (td->file_service_type == FIO_FSERVICE_RR)
+		f = get_next_file_rr(td);
+	else
+		f = get_next_file_rand(td);
+
 	if (!f) {
 		put_io_u(td, io_u);
 		return NULL;
@@ -486,8 +510,8 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 
 		icd->bytes_done[idx] += bytes;
 
-		if (icd->handler) {
-			ret = icd->handler(io_u);
+		if (io_u->end_io) {
+			ret = io_u->end_io(io_u);
 			if (ret && !icd->error)
 				icd->error = ret;
 		}
@@ -495,12 +519,10 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 		icd->error = io_u->error;
 }
 
-static void init_icd(struct io_completion_data *icd, endio_handler *handler,
-		     int nr)
+static void init_icd(struct io_completion_data *icd, int nr)
 {
 	fio_gettime(&icd->time, NULL);
 
-	icd->handler = handler;
 	icd->nr = nr;
 
 	icd->error = 0;
@@ -524,12 +546,11 @@ static void ios_completed(struct thread_data *td,
 /*
  * Complete a single io_u for the sync engines.
  */
-long io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
-			endio_handler *handler)
+long io_u_sync_complete(struct thread_data *td, struct io_u *io_u)
 {
 	struct io_completion_data icd;
 
-	init_icd(&icd, handler, 1);
+	init_icd(&icd, 1);
 	io_completed(td, io_u, &icd);
 	put_io_u(td, io_u);
 
@@ -542,9 +563,7 @@ long io_u_sync_complete(struct thread_data *td, struct io_u *io_u,
 /*
  * Called to complete min_events number of io for the async engines.
  */
-long io_u_queued_complete(struct thread_data *td, int min_events,
-			  endio_handler *handler)
-
+long io_u_queued_complete(struct thread_data *td, int min_events)
 {
 	struct io_completion_data icd;
 	struct timespec *tvp = NULL;
@@ -569,7 +588,7 @@ long io_u_queued_complete(struct thread_data *td, int min_events,
 	} else if (!ret)
 		return ret;
 
-	init_icd(&icd, handler, ret);
+	init_icd(&icd, ret);
 	ios_completed(td, &icd);
 	if (!icd.error)
 		return icd.bytes_done[0] + icd.bytes_done[1];