X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=f699951dcf58697f87922be056bfe99191e82f96;hp=2a468b134de5bb02ed3ee4dece8b8ea9b645b2b8;hb=b347f9daece7d65a6e596cd3bd0ef3602e40b059;hpb=4e78e405a12b31291aa88fffc1da2cf43b782ef5

diff --git a/fio.c b/fio.c
index 2a468b13..f699951d 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;
 }
 
 /*
@@ -895,25 +897,16 @@ void reset_all_stats(struct thread_data *td)
 	memcpy(&td->start, &tv, sizeof(tv));
 }
 
-static int clear_io_state(struct thread_data *td)
+static void clear_io_state(struct thread_data *td)
 {
 	struct fio_file *f;
 	unsigned int i;
-	int ret;
 
 	reset_io_counters(td);
 
 	close_files(td);
-
-	ret = 0;
-	for_each_file(td, f, i) {
+	for_each_file(td, f, i)
 		f->flags &= ~FIO_FILE_DONE;
-		ret = td_io_open_file(td, f);
-		if (ret)
-			break;
-	}
-
-	return ret;
 }
 
 /*
@@ -941,8 +934,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
@@ -998,9 +994,6 @@ static void *thread_main(void *data)
 	if (td_io_init(td))
 		goto err;
 
-	if (open_files(td))
-		goto err;
-
 	if (init_random_map(td))
 		goto err;
 
@@ -1023,8 +1016,8 @@ static void *thread_main(void *data)
 			memcpy(&td->lastrate, &td->ts.stat_sample_time,
 							sizeof(td->lastrate));
 
-		if (clear_state && clear_io_state(td))
-			break;
+		if (clear_state)
+			clear_io_state(td);
 
 		prune_io_piece_log(td);
 
@@ -1059,8 +1052,7 @@ static void *thread_main(void *data)
 		    (td->io_ops->flags & FIO_UNIDIR))
 			continue;
 
-		if (clear_io_state(td))
-			break;
+		clear_io_state(td);
 
 		fio_gettime(&td->start, NULL);
 
@@ -1116,8 +1108,11 @@ err:
 	close_ioengine(td);
 	cleanup_io_u(td);
 
-	if (td->o.cpumask_set)
-		fio_cpuset_exit(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
@@ -1268,16 +1263,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;
 }
 
@@ -1399,15 +1401,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");
@@ -1419,7 +1427,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");
 		}
 
 		/*