X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=backend.c;h=f3f103038474e3c7e19bd2ece97203080bdab857;hb=9c42684e32325da26e862280388798343c5f1305;hp=6e0e4424d6f6ce31d32ff6cf5d2ca77ba09111c2;hpb=649c10c59b016ae8586e54746d3761bc6df33c9b;p=fio.git

diff --git a/backend.c b/backend.c
index 6e0e4424..f3f10303 100644
--- a/backend.c
+++ b/backend.c
@@ -30,6 +30,7 @@
 #include <locale.h>
 #include <assert.h>
 #include <time.h>
+#include <inttypes.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/ipc.h>
@@ -67,7 +68,7 @@ int temp_stall_ts;
 unsigned long done_secs = 0;
 
 #define PAGE_ALIGN(buf)	\
-	(char *) (((unsigned long) (buf) + page_mask) & ~page_mask)
+	(char *) (((uintptr_t) (buf) + page_mask) & ~page_mask)
 
 #define JOB_START_TIMEOUT	(5 * 1000)
 
@@ -408,6 +409,9 @@ static void do_verify(struct thread_data *td)
 			}
 		}
 
+		if (flow_threshold_exceeded(td))
+			continue;
+
 		io_u = __get_io_u(td);
 		if (!io_u)
 			break;
@@ -559,6 +563,9 @@ static void do_io(struct thread_data *td)
 			}
 		}
 
+		if (flow_threshold_exceeded(td))
+			continue;
+
 		io_u = get_io_u(td);
 		if (!io_u)
 			break;
@@ -755,12 +762,13 @@ static void cleanup_io_u(struct thread_data *td)
 static int init_io_u(struct thread_data *td)
 {
 	struct io_u *io_u;
-	unsigned int max_bs;
+	unsigned int max_bs, min_write;
 	int cl_align, i, max_units;
 	char *p;
 
 	max_units = td->o.iodepth;
 	max_bs = max(td->o.max_bs[DDIR_READ], td->o.max_bs[DDIR_WRITE]);
+	min_write = td->o.min_bs[DDIR_WRITE];
 	td->orig_buffer_size = (unsigned long long) max_bs
 					* (unsigned long long) max_units;
 
@@ -809,7 +817,7 @@ static int init_io_u(struct thread_data *td)
 			dprint(FD_MEM, "io_u %p, mem %p\n", io_u, io_u->buf);
 
 			if (td_write(td))
-				io_u_fill_buffer(td, io_u, max_bs);
+				io_u_fill_buffer(td, io_u, min_write, max_bs);
 			if (td_write(td) && td->o.verify_pattern_bytes) {
 				/*
 				 * Fill the buffer with the pattern if we are
@@ -1179,7 +1187,7 @@ err:
 		write_iolog_close(td);
 
 	td_set_runstate(td, TD_EXITED);
-	return (void *) (unsigned long) td->error;
+	return (void *) (uintptr_t) td->error;
 }
 
 
@@ -1210,7 +1218,7 @@ static int fork_main(int shmid, int offset)
 	td = data + offset * sizeof(struct thread_data);
 	ret = thread_main(td);
 	shmdt(data);
-	return (int) (unsigned long) ret;
+	return (int) (uintptr_t) ret;
 }
 
 /*