X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=fio.c;h=6483e64c9462eeae4075fa6f449dae7970bb1eeb;hp=d8c143332823bf2c488ef0799951c8ce70c71fe3;hb=f9c843e87dc804530780f40714d70eadadb239e4;hpb=7a93ab190e5fea78edb21affeb0189a9d61a2cd8

diff --git a/fio.c b/fio.c
index d8c14333..6483e64c 100644
--- a/fio.c
+++ b/fio.c
@@ -645,6 +645,8 @@ static int init_io_u(struct thread_data *td)
 
 	p = ALIGN(td->orig_buffer);
 	for (i = 0; i < max_units; i++) {
+		if (td->terminate)
+			return 1;
 		io_u = malloc(sizeof(*io_u));
 		memset(io_u, 0, sizeof(*io_u));
 		INIT_LIST_HEAD(&io_u->list);
@@ -770,41 +772,45 @@ static void *thread_main(void *data)
 	INIT_LIST_HEAD(&td->io_hist_list);
 	td->io_hist_tree = RB_ROOT;
 
+	td_set_runstate(td, TD_INITIALIZED);
+	fio_sem_up(startup_sem);
+	fio_sem_down(td->mutex);
+
+	/*
+	 * the ->mutex semaphore is now no longer used, close it to avoid
+	 * eating a file descriptor
+	 */
+	fio_sem_remove(td->mutex);
+
+	/*
+	 * May alter parameters that init_io_u() will use, so we need to
+	 * do this first.
+	 */
+	if (init_iolog(td))
+		goto err;
+
 	if (init_io_u(td))
-		goto err_sem;
+		goto err;
 
-	if (fio_setaffinity(td) == -1) {
+	if (td->o.cpumask_set && fio_setaffinity(td) == -1) {
 		td_verror(td, errno, "cpu_set_affinity");
-		goto err_sem;
+		goto err;
 	}
 
-	if (init_iolog(td))
-		goto err_sem;
-
 	if (td->ioprio) {
 		if (ioprio_set(IOPRIO_WHO_PROCESS, 0, td->ioprio) == -1) {
 			td_verror(td, errno, "ioprio_set");
-			goto err_sem;
+			goto err;
 		}
 	}
 
 	if (nice(td->o.nice) == -1) {
 		td_verror(td, errno, "nice");
-		goto err_sem;
+		goto err;
 	}
 
 	if (td->o.ioscheduler && switch_ioscheduler(td))
-		goto err_sem;
-
-	td_set_runstate(td, TD_INITIALIZED);
-	fio_sem_up(startup_sem);
-	fio_sem_down(td->mutex);
-
-	/*
-	 * the ->mutex semaphore is now no longer used, close it to avoid
-	 * eating a file descriptor
-	 */
-	fio_sem_remove(td->mutex);
+		goto err;
 
 	if (!td->o.create_serialize && setup_files(td))
 		goto err;
@@ -913,9 +919,6 @@ err:
 	options_mem_free(td);
 	td_set_runstate(td, TD_EXITED);
 	return (void *) (unsigned long) td->error;
-err_sem:
-	fio_sem_up(startup_sem);
-	goto err;
 }
 
 /*