X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=io_u.c;h=64399797b9b97a03d3bb4375a75a09d43126a46b;hp=ae92df5d1a4d2559fe5d6c47be5d017529181f8f;hb=36167d82e5f49dee91c6d2cd426068edee90e36f;hpb=0032bf9fdccc4491e779a0c581c9bcb714b012f7;ds=sidebyside

diff --git a/io_u.c b/io_u.c
index ae92df5d..64399797 100644
--- a/io_u.c
+++ b/io_u.c
@@ -44,7 +44,6 @@ static void mark_random_map(struct thread_data *td, struct fio_file *f,
 		idx = RAND_MAP_IDX(td, f, block);
 		bit = RAND_MAP_BIT(td, f, block);
 
-		idx = f->num_maps;
 		fio_assert(td, idx < f->num_maps);
 
 		f->file_map[idx] |= (1UL << bit);
@@ -264,6 +263,40 @@ static void io_u_mark_depth(struct thread_data *td)
 	td->total_io_u++;
 }
 
+static void io_u_mark_latency(struct thread_data *td, unsigned long msec)
+{
+	int index = 0;
+
+	switch (msec) {
+	default:
+		index++;
+	case 1024 ... 2047:
+		index++;
+	case 512 ... 1023:
+		index++;
+	case 256 ... 511:
+		index++;
+	case 128 ... 255:
+		index++;
+	case 64 ... 127:
+		index++;
+	case 32 ... 63:
+		index++;
+	case 16 ... 31:
+		index++;
+	case 8 ... 15:
+		index++;
+	case 4 ... 7:
+		index++;
+	case 2 ... 3:
+		index++;
+	case 0 ... 1:
+		break;
+	}
+
+	td->io_u_lat[index]++;
+}
+
 struct io_u *__get_io_u(struct thread_data *td)
 {
 	struct io_u *io_u = NULL;
@@ -320,23 +353,23 @@ struct io_u *get_io_u(struct thread_data *td, struct fio_file *f)
 			return NULL;
 		}
 
-		f->last_pos += io_u->buflen;
+		f->last_pos = io_u->offset + io_u->buflen;
 
 		if (td->verify != VERIFY_NONE)
 			populate_verify_io_u(td, io_u);
 	}
 
-	if (td_io_prep(td, io_u)) {
-		put_io_u(td, io_u);
-		return NULL;
-	}
-
 	/*
 	 * Set io data pointers.
 	 */
 	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;
+	}
+
 	fio_gettime(&io_u->start_time, NULL);
 	return io_u;
 }
@@ -368,6 +401,7 @@ void io_completed(struct thread_data *td, struct io_u *io_u,
 
 		add_clat_sample(td, idx, msec);
 		add_bw_sample(td, idx, &icd->time);
+		io_u_mark_latency(td, msec);
 
 		if ((td_rw(td) || td_write(td)) && idx == DDIR_WRITE)
 			log_io_piece(td, io_u);
@@ -377,15 +411,20 @@ void io_completed(struct thread_data *td, struct io_u *io_u,
 		icd->error = io_u->error;
 }
 
-void ios_completed(struct thread_data *td, struct io_completion_data *icd)
+void init_icd(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;
+}
+
+void ios_completed(struct thread_data *td, struct io_completion_data *icd)
+{
+	struct io_u *io_u;
+	int i;
+
+	init_icd(icd);
 
 	for (i = 0; i < icd->nr; i++) {
 		io_u = td->io_ops->event(td, i);