X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=backend.c;h=52791040ff21384d283b2a09de3ff9718e19d866;hp=efb17b3bae550baeae02a5bb030ab0526171f7f1;hb=084d1c6f817eacaaefa1de4f0637ef6c1405d74b;hpb=a3efc919b0dcc27d65a6e84edca209b91cee173d

diff --git a/backend.c b/backend.c
index efb17b3b..52791040 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;
@@ -1019,7 +1026,8 @@ static void *thread_main(void *data)
 	if (td->o.cgroup_weight && cgroup_setup(td, cgroup_list, &cgroup_mnt))
 		goto err;
 
-	if (nice(td->o.nice) == -1) {
+	errno = 0;
+	if (nice(td->o.nice) == -1 && errno != 0) {
 		td_verror(td, errno, "nice");
 		goto err;
 	}
@@ -1178,7 +1186,7 @@ err:
 		write_iolog_close(td);
 
 	td_set_runstate(td, TD_EXITED);
-	return (void *) (unsigned long) td->error;
+	return (void *) (uintptr_t) td->error;
 }
 
 
@@ -1209,7 +1217,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;
 }
 
 /*
@@ -1493,7 +1501,8 @@ static void run_threads(void)
 		}
 
 		if (left) {
-			log_err("fio: %d jobs failed to start\n", left);
+			log_err("fio: %d job%s failed to start\n", left,
+					left > 1 ? "s" : "");
 			for (i = 0; i < this_jobs; i++) {
 				td = map[i];
 				if (!td)