X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fio.c;h=b4415fa7d942c2413018fb1f174345c9cb74c339;hb=b36beb6e98d0785558a05b796dc216ecd4c49c62;hp=a11f2bbb76e6989aa1ecf22094fdca2495dd7a1d;hpb=6dd6f2cd9fd0a59054c9d003c758d810fd5a8f4a;p=fio.git

diff --git a/fio.c b/fio.c
index a11f2bbb..b4415fa7 100644
--- a/fio.c
+++ b/fio.c
@@ -171,13 +171,15 @@ static void set_sig_handlers(void)
 
 static inline int should_check_rate(struct thread_data *td)
 {
+	struct thread_options *o = &td->o;
+
 	/*
-	 * No minimum rate set, always ok
+	 * If some rate setting was given, we need to check it
 	 */
-	if (!td->o.ratemin && !td->o.rate_iops_min)
-		return 0;
+	if (o->rate || o->ratemin || o->rate_iops || o->rate_iops_min)
+		return 1;
 
-	return 1;
+	return 0;
 }
 
 /*
@@ -941,8 +943,11 @@ static void *thread_main(void *data)
 	td->io_hist_tree = RB_ROOT;
 
 	td_set_runstate(td, TD_INITIALIZED);
+	dprint(FD_MUTEX, "up startup_mutex\n");
 	fio_mutex_up(startup_mutex);
+	dprint(FD_MUTEX, "wait on td->mutex\n");
 	fio_mutex_down(td->mutex);
+	dprint(FD_MUTEX, "done waiting on td->mutex\n");
 
 	/*
 	 * the ->mutex mutex is now no longer used, close it to avoid
@@ -970,10 +975,6 @@ static void *thread_main(void *data)
 	 * thread from this job
 	 */
 	if (td->o.gtod_cpu) {
-		if (fio_getaffinity(td->pid, &td->o.cpumask) == -1) {
-			td_verror(td, errno, "cpu_get_affinity");
-			goto err;
-		}
 		fio_cpu_clear(&td->o.cpumask, td->o.gtod_cpu);
 		if (fio_setaffinity(td) == -1) {
 			td_verror(td, errno, "cpu_set_affinity");
@@ -1120,6 +1121,12 @@ err:
 	close_ioengine(td);
 	cleanup_io_u(td);
 
+	if (td->o.cpumask_set) {
+		int ret = fio_cpuset_exit(&td->o.cpumask);
+
+		td_verror(td, ret, "fio_cpuset_exit");
+	}
+
 	/*
 	 * do this very late, it will log file closing as well
 	 */
@@ -1269,16 +1276,23 @@ static void *gtod_thread_main(void *data)
 
 static int fio_start_gtod_thread(void)
 {
-	if (pthread_create(&gtod_thread, NULL, gtod_thread_main, NULL)) {
-		perror("Can't create gtod thread");
+	int ret;
+
+	ret = pthread_create(&gtod_thread, NULL, gtod_thread_main, NULL);
+	if (ret) {
+		log_err("Can't create gtod thread: %s\n", strerror(ret));
 		return 1;
 	}
-	if (pthread_detach(gtod_thread) < 0) {
-		perror("Can't detatch gtod thread");
+
+	ret = pthread_detach(gtod_thread);
+	if (ret) {
+		log_err("Can't detatch gtod thread: %s\n", strerror(ret));
 		return 1;
 	}
 
+	dprint(FD_MUTEX, "wait on startup_mutex\n");
 	fio_mutex_down(startup_mutex);
+	dprint(FD_MUTEX, "done waiting on startup_mutex\n");
 	return 0;
 }
 
@@ -1400,15 +1414,21 @@ static void run_threads(void)
 			nr_started++;
 
 			if (td->o.use_thread) {
+				int ret;
+
 				dprint(FD_PROCESS, "will pthread_create\n");
-				if (pthread_create(&td->thread, NULL,
-						   thread_main, td)) {
-					perror("pthread_create");
+				ret = pthread_create(&td->thread, NULL,
+							thread_main, td);
+				if (ret) {
+					log_err("pthread_create: %s\n",
+							strerror(ret));
 					nr_started--;
 					break;
 				}
-				if (pthread_detach(td->thread) < 0)
-					perror("pthread_detach");
+				ret = pthread_detach(td->thread);
+				if (ret)
+					log_err("pthread_detach: %s",
+							strerror(ret));
 			} else {
 				pid_t pid;
 				dprint(FD_PROCESS, "will fork\n");
@@ -1420,7 +1440,9 @@ static void run_threads(void)
 				} else if (i == fio_debug_jobno)
 					*fio_debug_jobp = pid;
 			}
+			dprint(FD_MUTEX, "wait on startup_mutex\n");
 			fio_mutex_down(startup_mutex);
+			dprint(FD_MUTEX, "done waiting on startup_mutex\n");
 		}
 
 		/*