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

diff --git a/fio.c b/fio.c
index 3944ce73..2a468b13 100644
--- a/fio.c
+++ b/fio.c
@@ -673,7 +673,7 @@ sync_done:
 				int left;
 
 				if (td->o.thinktime_spin)
-					__usec_sleep(td->o.thinktime_spin);
+					usec_spin(td->o.thinktime_spin);
 
 				left = td->o.thinktime - td->o.thinktime_spin;
 				if (left)
@@ -970,10 +970,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 +1116,9 @@ err:
 	close_ioengine(td);
 	cleanup_io_u(td);
 
+	if (td->o.cpumask_set)
+		fio_cpuset_exit(td);
+
 	/*
 	 * do this very late, it will log file closing as well
 	 */