X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=34c7e6f44bce50fed649380d391977de9752b32c;hp=318614cdb39b5213fc8d833a9f028b560f27eb84;hb=5fdd124a3b811993542825847f207587d5f4661e;hpb=f697125ab9003d358a37186d610e09799afd190f;ds=sidebyside

diff --git a/io_u.c b/io_u.c
index 318614cd..34c7e6f4 100644
--- a/io_u.c
+++ b/io_u.c
@@ -27,13 +27,16 @@ static int random_map_free(struct thread_data *td, struct fio_file *f,
 static void mark_random_map(struct thread_data *td, struct fio_file *f,
 			    struct io_u *io_u)
 {
-	unsigned int min_bs = td->min_bs[io_u->ddir];
+	unsigned int min_bs = td->rw_min_bs;
 	unsigned long long block;
 	unsigned int blocks;
+	unsigned int nr_blocks;
 
 	block = io_u->offset / (unsigned long long) min_bs;
 	blocks = 0;
-	while (blocks < (io_u->buflen / min_bs)) {
+	nr_blocks = (io_u->buflen + min_bs - 1) / min_bs;
+
+	while (blocks < nr_blocks) {
 		unsigned int idx, bit;
 
 		if (!random_map_free(td, f, block))
@@ -61,11 +64,12 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 {
 	int i;
 
-	*b = 0;
-	i = 0;
-	while ((*b) * td->rw_min_bs < f->file_size) {
+	i = f->last_free_lookup;
+	*b = (i * BLOCKS_PER_MAP);
+	while ((*b) * td->rw_min_bs < f->real_file_size) {
 		if (f->file_map[i] != -1UL) {
 			*b += ffz(f->file_map[i]);
+			f->last_free_lookup = i;
 			return 0;
 		}
 
@@ -82,14 +86,15 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
  * the last io issued.
  */
 static int get_next_offset(struct thread_data *td, struct fio_file *f,
-			   unsigned long long *offset, int ddir)
+			   struct io_u *io_u)
 {
+	const int ddir = io_u->ddir;
 	unsigned long long b, rb;
 	long r;
 
 	if (!td->sequential) {
 		unsigned long long max_blocks = f->file_size / td->min_bs[ddir];
-		int loops = 50;
+		int loops = 5;
 
 		do {
 			r = os_random_long(&td->random_state);
@@ -103,12 +108,14 @@ static int get_next_offset(struct thread_data *td, struct fio_file *f,
 		if (!loops) {
 			if (get_next_free_block(td, f, &b))
 				return 1;
+
+			b += f->file_offset / td->min_bs[ddir];
 		}
 	} else
 		b = f->last_pos / td->min_bs[ddir];
 
-	*offset = (b * td->min_bs[ddir]) + f->file_offset;
-	if (*offset > f->file_size)
+	io_u->offset = (b * td->min_bs[ddir]) + f->file_offset;
+	if (io_u->offset > f->real_file_size)
 		return 1;
 
 	return 0;
@@ -123,7 +130,7 @@ static unsigned int get_next_buflen(struct thread_data *td, int ddir)
 		buflen = td->min_bs[ddir];
 	else {
 		r = os_random_long(&td->bsrange_state);
-		buflen = (1 + (double) (td->max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
+		buflen = (unsigned int) (1 + (double) (td->max_bs[ddir] - 1) * r / (RAND_MAX + 1.0));
 		if (!td->bs_unaligned)
 			buflen = (buflen + td->min_bs[ddir] - 1) & ~(td->min_bs[ddir] - 1);
 	}
@@ -147,13 +154,13 @@ static unsigned int get_next_buflen(struct thread_data *td, int ddir)
  * mixed read/write workload, check the rwmix cycle and switch if
  * necessary.
  */
-static int get_rw_ddir(struct thread_data *td)
+static enum fio_ddir get_rw_ddir(struct thread_data *td)
 {
 	if (td_rw(td)) {
 		struct timeval now;
 		unsigned long elapsed;
 
-		gettimeofday(&now, NULL);
+		fio_gettime(&now, NULL);
 	 	elapsed = mtime_since_now(&td->rwmix_switch);
 
 		/*
@@ -208,11 +215,19 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
 	io_u->ddir = get_rw_ddir(td);
 
 	/*
-	 * No log, let the seq/rand engine retrieve the next position.
+	 * No log, let the seq/rand engine retrieve the next buflen and
+	 * position.
 	 */
-	if (!get_next_offset(td, f, &io_u->offset, io_u->ddir)) {
-		io_u->buflen = get_next_buflen(td, io_u->ddir);
-		if (io_u->buflen) {
+	io_u->buflen = get_next_buflen(td, io_u->ddir);
+	if (io_u->buflen) {
+		if (!get_next_offset(td, f, io_u)) {
+			/*
+			 * mark entry before potentially trimming io_u
+			 */
+			if (!td->read_iolog && !td->sequential &&
+			    !td->norandommap)
+				mark_random_map(td, f, io_u);
+
 			/*
 			 * If using a write iolog, store this entry.
 			 */
@@ -227,6 +242,31 @@ static int fill_io_u(struct thread_data *td, struct fio_file *f,
 	return 1;
 }
 
+static void io_u_mark_depth(struct thread_data *td)
+{
+	int index = 0;
+
+	switch (td->cur_depth) {
+	default:
+		index++;
+	case 32 ... 63:
+		index++;
+	case 16 ... 31:
+		index++;
+	case 8 ... 15:
+		index++;
+	case 4 ... 7:
+		index++;
+	case 2 ... 3:
+		index++;
+	case 1:
+		break;
+	}
+
+	td->io_u_map[index]++;
+	td->total_io_u++;
+}
+
 struct io_u *__get_io_u(struct thread_data *td)
 {
 	struct io_u *io_u = NULL;
@@ -240,6 +280,7 @@ struct io_u *__get_io_u(struct thread_data *td)
 		list_del(&io_u->list);
 		list_add(&io_u->list, &td->io_u_busylist);
 		td->cur_depth++;
+		io_u_mark_depth(td);
 	}
 
 	return io_u;
@@ -267,13 +308,13 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 		return NULL;
 	}
 
-	if (io_u->buflen + io_u->offset > f->file_size) {
+	if (io_u->buflen + io_u->offset > f->real_file_size) {
 		if (td->io_ops->flags & FIO_RAWIO) {
 			put_io_u(td, io_u);
 			return NULL;
 		}
 
-		io_u->buflen = f->file_size - io_u->offset;
+		io_u->buflen = f->real_file_size - io_u->offset;
 	}
 
 	if (io_u->ddir != DDIR_SYNC) {
@@ -282,9 +323,6 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 			return NULL;
 		}
 
-		if (!td->read_iolog && !td->sequential && !td->norandommap)
-			mark_random_map(td, f, io_u);
-
 		f->last_pos += io_u->buflen;
 
 		if (td->verify != VERIFY_NONE)
@@ -296,14 +334,19 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 		return NULL;
 	}
 
-	gettimeofday(&io_u->start_time, NULL);
+	/*
+	 * Set io data pointers.
+	 */
+	io_u->xfer_buf = io_u->buf;
+	io_u->xfer_buflen = io_u->buflen;
+
+	fio_gettime(&io_u->start_time, NULL);
 	return io_u;
 }
 
 void io_completed(struct thread_data *td, struct io_u *io_u,
 		  struct io_completion_data *icd)
 {
-	struct timeval e;
 	unsigned long msec;
 
 	if (io_u->ddir == DDIR_SYNC) {
@@ -313,21 +356,21 @@ void io_completed(struct thread_data *td, struct io_u *io_u,
 
 	td->last_was_sync = 0;
 
-	gettimeofday(&e, NULL);
-
 	if (!io_u->error) {
 		unsigned int bytes = io_u->buflen - io_u->resid;
-		const int idx = io_u->ddir;
+		const enum fio_ddir idx = io_u->ddir;
 
 		td->io_blocks[idx]++;
 		td->io_bytes[idx] += bytes;
 		td->zone_bytes += bytes;
 		td->this_io_bytes[idx] += bytes;
 
-		msec = mtime_since(&io_u->issue_time, &e);
+		io_u->file->last_completed_pos = io_u->offset + io_u->buflen;
+
+		msec = mtime_since(&io_u->issue_time, &icd->time);
 
 		add_clat_sample(td, idx, msec);
-		add_bw_sample(td, idx);
+		add_bw_sample(td, idx, &icd->time);
 
 		if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
 			log_io_piece(td, io_u);
@@ -342,6 +385,8 @@ void ios_completed(struct thread_data *td, struct io_completion_data *icd)
 	struct io_u *io_u;
 	int i;
 
+	fio_gettime(&icd->time, NULL);
+
 	icd->error = 0;
 	icd->bytes_done[0] = icd->bytes_done[1] = 0;
 
@@ -352,5 +397,3 @@ void ios_completed(struct thread_data *td, struct io_completion_data *icd)
 		put_io_u(td, io_u);
 	}
 }
-
-