X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=gettime.c;h=6863ce3f97cef140e967990b9b8a7dc0bf3b0126;hb=bb1116fe9a53154447bb4305ed9d9fd42d2a6aa1;hp=72968c55c86c80e37cb2d320dc3a2a8b7159e8c6;hpb=e51a662940b8a24d2c1430bfe003423297171680;p=fio.git

diff --git a/gettime.c b/gettime.c
index 72968c55..6863ce3f 100644
--- a/gettime.c
+++ b/gettime.c
@@ -477,12 +477,20 @@ static void *clock_thread_fn(void *data)
 	uint32_t last_seq;
 	int i;
 
-	memset(&cpu_mask, 0, sizeof(cpu_mask));
+	if (fio_cpuset_init(&cpu_mask)) {
+		int __err = errno;
+
+		log_err("clock cpuset init failed: %s\n", strerror(__err));
+		goto err_out;
+	}
+
 	fio_cpu_set(&cpu_mask, t->cpu);
 
 	if (fio_setaffinity(gettid(), cpu_mask) == -1) {
-		log_err("clock setaffinity failed\n");
-		return (void *) 1;
+		int __err = errno;
+
+		log_err("clock setaffinity failed: %s\n", strerror(__err));
+		goto err;
 	}
 
 	pthread_mutex_lock(&t->lock);
@@ -518,9 +526,14 @@ static void *clock_thread_fn(void *data)
 	 * indefinitely. Check for that and return failure.
 	 */
 	if (!t->entries[i - 1].tsc && !t->entries[0].tsc)
-		return (void *) 1;
+		goto err;
 
+	fio_cpuset_exit(&cpu_mask);
 	return NULL;
+err:
+	fio_cpuset_exit(&cpu_mask);
+err_out:
+	return (void *) 1;
 }
 
 static int clock_cmp(const void *p1, const void *p2)