X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=011c13a31a6e2cabea1ea4254d69b9a16604726d;hp=53735c6c8801c3f47568eef3fded46a136e27f2b;hb=75e6f36fae06978f29296fce76a7f00ca0df7b56;hpb=8e9fe637622aab409101c90d26670375a50ff4f3

diff --git a/fio.c b/fio.c
index 53735c6c..011c13a3 100644
--- a/fio.c
+++ b/fio.c
@@ -218,14 +218,14 @@ static int fio_io_sync(struct thread_data *td, struct fio_file *f)
 
 	ret = td_io_queue(td, io_u);
 	if (ret) {
+		td_verror(td, io_u->error);
 		put_io_u(td, io_u);
-		td_verror(td, ret);
 		return 1;
 	}
 
 	ret = td_io_getevents(td, 1, td->cur_depth, NULL);
 	if (ret < 0) {
-		td_verror(td, -ret);
+		td_verror(td, ret);
 		return 1;
 	}
 
@@ -292,8 +292,8 @@ void do_verify(struct thread_data *td)
 
 		ret = td_io_queue(td, io_u);
 		if (ret) {
+			td_verror(td, io_u->error);
 			put_io_u(td, io_u);
-			td_verror(td, ret);
 			break;
 		}
 
@@ -399,8 +399,8 @@ static void do_io(struct thread_data *td)
 
 		ret = td_io_queue(td, io_u);
 		if (ret) {
+			td_verror(td, io_u->error);
 			put_io_u(td, io_u);
-			td_verror(td, ret);
 			break;
 		}
 
@@ -436,7 +436,7 @@ static void do_io(struct thread_data *td)
 		gettimeofday(&e, NULL);
 		usec = utime_since(&s, &e);
 
-		rate_throttle(td, usec, icd.bytes_done[td->ddir]);
+		rate_throttle(td, usec, icd.bytes_done[td->ddir], td->ddir);
 
 		if (check_min_rate(td, &e)) {
 			if (rate_quit)
@@ -479,9 +479,23 @@ static void cleanup_io_u(struct thread_data *td)
 	free_io_mem(td);
 }
 
+/*
+ * "randomly" fill the buffer contents
+ */
+static void fill_rand_buf(struct io_u *io_u, int max_bs)
+{
+	int *ptr = io_u->buf;
+
+	while ((void *) ptr - io_u->buf < max_bs) {
+		*ptr = rand() * 0x9e370001;
+		ptr++;
+	}
+}
+
 static int init_io_u(struct thread_data *td)
 {
 	struct io_u *io_u;
+	unsigned int max_bs;
 	int i, max_units;
 	char *p;
 
@@ -493,7 +507,8 @@ static int init_io_u(struct thread_data *td)
 	else
 		max_units = td->iodepth;
 
-	td->orig_buffer_size = td->max_bs * max_units + MASK;
+	max_bs = max(td->max_bs[DDIR_READ], td->max_bs[DDIR_WRITE]);
+	td->orig_buffer_size = max_bs * max_units + MASK;
 
 	if (allocate_io_mem(td))
 		return 1;
@@ -504,7 +519,10 @@ static int init_io_u(struct thread_data *td)
 		memset(io_u, 0, sizeof(*io_u));
 		INIT_LIST_HEAD(&io_u->list);
 
-		io_u->buf = p + td->max_bs * i;
+		io_u->buf = p + max_bs * i;
+		if (td_write(td) || td_rw(td))
+			fill_rand_buf(io_u, max_bs);
+
 		io_u->index = i;
 		list_add(&io_u->list, &td->io_u_freelist);
 	}
@@ -518,6 +536,9 @@ static int switch_ioscheduler(struct thread_data *td)
 	FILE *f;
 	int ret;
 
+	if (td->io_ops->flags & FIO_CPUIO)
+		return 0;
+
 	sprintf(tmp, "%s/queue/scheduler", td->sysfs_root);
 
 	f = fopen(tmp, "r+");
@@ -686,7 +707,7 @@ static void *thread_main(void *data)
 		finish_log(td, td->slat_log, "slat");
 	if (td->clat_log)
 		finish_log(td, td->clat_log, "clat");
-	if (td->write_iolog)
+	if (td->write_iolog_file)
 		write_iolog_close(td);
 	if (td->exec_postrun)
 		system(td->exec_postrun);