X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=55f3c78c72cbd773cf24a503e30814a9c788e1cf;hp=9aab97f7b8a653f4a4f6181a8861d1289043199e;hb=0c3d768a44543dd6c23337eafc726e7f88dc3076;hpb=a783e61aadbdd51ea69b8c62a3cbe0897b739123

diff --git a/io_u.c b/io_u.c
index 9aab97f7..55f3c78c 100644
--- a/io_u.c
+++ b/io_u.c
@@ -55,7 +55,7 @@ static void mark_random_map(struct thread_data *td, struct io_u *io_u)
 		 * If we have a mixed random workload, we may
 		 * encounter blocks we already did IO to.
 		 */
-		if (!td->o.ddir_nr && !random_map_free(td, f, block))
+		if (!td->o.ddir_nr == 1 && !random_map_free(td, f, block))
 			break;
 
 		idx = RAND_MAP_IDX(td, f, block);
@@ -162,10 +162,12 @@ static int get_next_offset(struct thread_data *td, struct io_u *io_u)
 		if (get_next_rand_offset(td, f, ddir, &b))
 			return 1;
 	} else {
-		if (f->last_pos >= f->real_file_size)
-			return 1;
-
-		b = f->last_pos / td->o.min_bs[ddir];
+		if (f->last_pos >= f->real_file_size) {
+			if (!td_random(td) || get_next_rand_offset(td, f, ddir, &b))
+				return 1;
+		} else {
+			b = f->last_pos / td->o.min_bs[ddir];
+		}
 	}
 
 	io_u->offset = (b * td->o.min_bs[ddir]) + f->file_offset;
@@ -190,6 +192,9 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 			buflen = (buflen + td->o.min_bs[ddir] - 1) & ~(td->o.min_bs[ddir] - 1);
 	}
 
+	if (io_u->offset + buflen > io_u->file->real_file_size)
+		buflen = td->o.min_bs[ddir];
+
 	return buflen;
 }
 
@@ -309,12 +314,6 @@ void requeue_io_u(struct thread_data *td, struct io_u **io_u)
 
 static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 {
-	/*
-	 * If using an iolog, grab next piece if any available.
-	 */
-	if (td->o.read_iolog_file)
-		return read_iolog_get(td, io_u);
-
 	/*
 	 * see if it's time to sync
 	 */
@@ -327,6 +326,15 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 
 	io_u->ddir = get_rw_ddir(td);
 
+	/*
+	 * See if it's time to switch to a new zone
+	 */
+	if (td->zone_bytes >= td->o.zone_size) {
+		td->zone_bytes = 0;
+		io_u->file->last_pos += td->o.zone_skip;
+		td->io_skip_bytes += td->o.zone_skip;
+	}
+
 	/*
 	 * No log, let the seq/rand engine retrieve the next buflen and
 	 * position.
@@ -338,6 +346,9 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	if (!io_u->buflen)
 		return 1;
 
+	if (io_u->offset + io_u->buflen > io_u->file->real_file_size)
+		return 1;
+
 	/*
 	 * mark entry before potentially trimming io_u
 	 */
@@ -348,9 +359,7 @@ static int fill_io_u(struct thread_data *td, struct io_u *io_u)
 	 * If using a write iolog, store this entry.
 	 */
 out:
-	if (td->o.write_iolog_file)
-		write_iolog_put(td, io_u);
-
+	log_io_u(td, io_u);
 	return 0;
 }
 
@@ -387,38 +396,98 @@ void io_u_mark_depth(struct thread_data *td, struct io_u *io_u)
 	td->ts.total_io_u[io_u->ddir]++;
 }
 
-static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
+static void io_u_mark_lat_usec(struct thread_data *td, unsigned long usec)
+{
+	int index = 0;
+
+	assert(usec < 1000);
+
+	switch (usec) {
+	case 750 ... 999:
+		index = 9;
+		break;
+	case 500 ... 749:
+		index = 8;
+		break;
+	case 250 ... 499:
+		index = 7;
+		break;
+	case 100 ... 249:
+		index = 6;
+		break;
+	case 50 ... 99:
+		index = 5;
+		break;
+	case 20 ... 49:
+		index = 4;
+		break;
+	case 10 ... 19:
+		index = 3;
+		break;
+	case 4 ... 9:
+		index = 2;
+		break;
+	case 2 ... 3:
+		index = 1;
+	case 0 ... 1:
+		break;
+	}
+
+	assert(index < FIO_IO_U_LAT_U_NR);
+	td->ts.io_u_lat_u[index]++;
+}
+
+static void io_u_mark_lat_msec(struct thread_data *td, unsigned long msec)
 {
 	int index = 0;
 
 	switch (msec) {
 	default:
-		index++;
+		index = 11;
+		break;
 	case 1000 ... 1999:
-		index++;
+		index = 10;
+		break;
 	case 750 ... 999:
-		index++;
+		index = 9;
+		break;
 	case 500 ... 749:
-		index++;
+		index = 8;
+		break;
 	case 250 ... 499:
-		index++;
+		index = 7;
+		break;
 	case 100 ... 249:
-		index++;
+		index = 6;
+		break;
 	case 50 ... 99:
-		index++;
+		index = 5;
+		break;
 	case 20 ... 49:
-		index++;
+		index = 4;
+		break;
 	case 10 ... 19:
-		index++;
+		index = 3;
+		break;
 	case 4 ... 9:
-		index++;
+		index = 2;
+		break;
 	case 2 ... 3:
-		index++;
+		index = 1;
 	case 0 ... 1:
 		break;
 	}
 
-	td->ts.io_u_lat[index]++;
+	assert(index < FIO_IO_U_LAT_M_NR);
+	td->ts.io_u_lat_m[index]++;
+}
+
+static void io_u_mark_latency(struct thread_data *td, unsigned long usec)
+{
+	if (usec < 1000)
+		io_u_mark_lat_usec(td, usec);
+	else
+		io_u_mark_lat_msec(td, usec / 1000);
 }
 
 /*
@@ -511,6 +580,50 @@ static struct fio_file *find_next_new_file(struct thread_data *td)
 	return f;
 }
 
+static int set_io_u_file(struct thread_data *td, struct io_u *io_u)
+{
+	struct fio_file *f;
+
+	do {
+		f = get_next_file(td);
+		if (!f)
+			return 1;
+
+set_file:
+		io_u->file = f;
+		get_file(f);
+
+		if (!fill_io_u(td, io_u))
+			break;
+
+		/*
+		 * td_io_close() does a put_file() as well, so no need to
+		 * do that here.
+		 */
+		io_u->file = NULL;
+		td_io_close_file(td, f);
+		f->flags |= FIO_FILE_DONE;
+		td->nr_done_files++;
+
+		/*
+		 * probably not the right place to do this, but see
+		 * if we need to open a new file
+		 */
+		if (td->nr_open_files < td->o.open_files &&
+		    td->o.open_files != td->o.nr_files) {
+			f = find_next_new_file(td);
+
+			if (!f || td_io_open_file(td, f))
+				return 1;
+
+			goto set_file;
+		}
+	} while (1);
+
+	return 0;
+}
+
+
 struct io_u *__get_io_u(struct thread_data *td)
 {
 	struct io_u *io_u = NULL;
@@ -547,7 +660,6 @@ struct io_u *get_io_u(struct thread_data *td)
 {
 	struct fio_file *f;
 	struct io_u *io_u;
-	int ret;
 
 	io_u = __get_io_u(td);
 	if (!io_u)
@@ -559,57 +671,21 @@ struct io_u *get_io_u(struct thread_data *td)
 	if (io_u->file)
 		goto out;
 
-	do {
-		f = get_next_file(td);
-		if (!f) {
-			put_io_u(td, io_u);
-			return NULL;
-		}
-
-set_file:
-		io_u->file = f;
-		get_file(f);
-
-		if (!fill_io_u(td, io_u))
-			break;
-
-		/*
-		 * td_io_close() does a put_file() as well, so no need to
-		 * do that here.
-		 */
-		io_u->file = NULL;
-		td_io_close_file(td, f);
-		f->flags |= FIO_FILE_DONE;
-		td->nr_done_files++;
-
-		/*
-		 * probably not the right place to do this, but see
-		 * if we need to open a new file
-		 */
-		if (td->nr_open_files < td->o.open_files &&
-		    td->o.open_files != td->o.nr_files) {
-			f = find_next_new_file(td);
-
-			if (!f || (ret = td_io_open_file(td, f))) {
-				put_io_u(td, io_u);
-				return NULL;
-			}
-			goto set_file;
-		}
-	} while (1);
-
-	assert(io_u->file->flags & FIO_FILE_OPEN);
-
-	if (td->zone_bytes >= td->o.zone_size) {
-		td->zone_bytes = 0;
-		f->last_pos += td->o.zone_skip;
-	}
+	/*
+	 * If using an iolog, grab next piece if any available.
+	 */
+	if (td->o.read_iolog_file) {
+		if (read_iolog_get(td, io_u))
+			goto err_put;
+	} else if (set_io_u_file(td, io_u))
+		goto err_put;
+	
+	f = io_u->file;
+	assert(f->flags & FIO_FILE_OPEN);
 
 	if (io_u->ddir != DDIR_SYNC) {
-		if (!io_u->buflen) {
-			put_io_u(td, io_u);
-			return NULL;
-		}
+		if (!io_u->buflen)
+			goto err_put;
 
 		f->last_pos = io_u->offset + io_u->buflen;
 
@@ -625,13 +701,13 @@ out:
 	io_u->xfer_buf = io_u->buf;
 	io_u->xfer_buflen = io_u->buflen;
 
-	if (td_io_prep(td, io_u)) {
-		put_io_u(td, io_u);
-		return NULL;
+	if (!td_io_prep(td, io_u)) {
+		fio_gettime(&io_u->start_time, NULL);
+		return io_u;
 	}
-
-	fio_gettime(&io_u->start_time, NULL);
-	return io_u;
+err_put:
+	put_io_u(td, io_u);
+	return NULL;
 }
 
 void io_u_log_error(struct thread_data *td, struct io_u *io_u)
@@ -682,7 +758,7 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 
 		add_clat_sample(td, idx, usec);
 		add_bw_sample(td, idx, &icd->time);
-		io_u_mark_latency(td, usec / 1000);
+		io_u_mark_latency(td, usec);
 
 		if (td_write(td) && idx == DDIR_WRITE &&
 		    td->o.verify != VERIFY_NONE)