X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=io_u.c;h=47c02e0ad135dea4da458da5e0116084dd7885d7;hb=4e9401cdc69751ab4739df08140a2bbadee7da77;hp=71089390a401e0899b1d7bdca9f8297f19dbfb32;hpb=5bfc35d7abe2582dc54127ca1d6e03792c9d62f5;p=fio.git

diff --git a/io_u.c b/io_u.c
index 71089390..47c02e0a 100644
--- a/io_u.c
+++ b/io_u.c
@@ -113,7 +113,8 @@ static int get_next_free_block(struct thread_data *td, struct fio_file *f,
 
 	i = f->last_free_lookup;
 	*b = (i * BLOCKS_PER_MAP);
-	while ((*b) * min_bs < f->real_file_size) {
+	while ((*b) * min_bs < f->real_file_size &&
+		(*b) * min_bs < f->io_size) {
 		if (f->file_map[i] != (unsigned int) -1) {
 			*b += ffz(f->file_map[i]);
 			if (*b > last_block(td, f, ddir))
@@ -248,7 +249,7 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 		buflen = minbs;
 	else {
 		r = os_random_long(&td->bsrange_state);
-		if (!td->o.bssplit_nr) {
+		if (!td->o.bssplit_nr[ddir]) {
 			buflen = 1 + (unsigned int) ((double) maxbs *
 					(r / (OS_RAND_MAX + 1.0)));
 			if (buflen < minbs)
@@ -257,8 +258,8 @@ static unsigned int get_next_buflen(struct thread_data *td, struct io_u *io_u)
 			long perc = 0;
 			unsigned int i;
 
-			for (i = 0; i < td->o.bssplit_nr; i++) {
-				struct bssplit *bsp = &td->o.bssplit[i];
+			for (i = 0; i < td->o.bssplit_nr[ddir]; i++) {
+				struct bssplit *bsp = &td->o.bssplit[ddir][i];
 
 				buflen = bsp->bs;
 				perc += bsp->perc;
@@ -685,6 +686,7 @@ static struct fio_file *get_next_file_rr(struct thread_data *td, int goodf,
 			if (err) {
 				dprint(FD_FILE, "error %d on open of %s\n",
 					err, f->file_name);
+				f = NULL;
 				continue;
 			}
 			opened = 1;
@@ -837,7 +839,7 @@ struct io_u *get_io_u(struct thread_data *td)
 
 		f->last_pos = io_u->offset + io_u->buflen;
 
-		if (td->o.verify != VERIFY_NONE)
+		if (td->o.verify != VERIFY_NONE && io_u->ddir == DDIR_WRITE)
 			populate_verify_io_u(td, io_u);
 		else if (td->o.refill_buffers && io_u->ddir == DDIR_WRITE)
 			io_u_fill_buffer(td, io_u, io_u->xfer_buflen);
@@ -846,7 +848,6 @@ struct io_u *get_io_u(struct thread_data *td)
 	/*
 	 * Set io data pointers.
 	 */
-	io_u->endpos = io_u->offset + io_u->buflen;
 	io_u->xfer_buf = io_u->buf;
 	io_u->xfer_buflen = io_u->buflen;
 
@@ -916,11 +917,11 @@ static void io_completed(struct thread_data *td, struct io_u *io_u,
 							&icd->time);
 
 			if (!td->o.disable_clat) {
-				add_clat_sample(td, idx, usec);
+				add_clat_sample(td, idx, usec, bytes);
 				io_u_mark_latency(td, usec);
 			}
 			if (!td->o.disable_bw)
-				add_bw_sample(td, idx, &icd->time);
+				add_bw_sample(td, idx, bytes, &icd->time);
 		}
 
 		if (td_write(td) && idx == DDIR_WRITE &&
@@ -1025,7 +1026,7 @@ void io_u_queued(struct thread_data *td, struct io_u *io_u)
 		unsigned long slat_time;
 
 		slat_time = utime_since(&io_u->start_time, &io_u->issue_time);
-		add_slat_sample(td, io_u->ddir, slat_time);
+		add_slat_sample(td, io_u->ddir, io_u->xfer_buflen, slat_time);
 	}
 }