X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gettime-thread.c;h=fc52236bf5969028aabec5c0507f445e91298d65;hp=da409042f2ec6eb7344b6f943dad0eba84c54cd1;hb=493dd6c153bc169e1b52757e496d64ea596f165d;hpb=8e600258bad065fbdfd6a1b2856077d12cd521e5

diff --git a/gettime-thread.c b/gettime-thread.c
index da409042..fc52236b 100644
--- a/gettime-thread.c
+++ b/gettime-thread.c
@@ -6,28 +6,53 @@
 #include "fio.h"
 #include "smalloc.h"
 
-struct timeval *fio_tv;
+struct timespec *fio_ts = NULL;
 int fio_gtod_offload = 0;
-int fio_gtod_cpu = -1;
 static pthread_t gtod_thread;
+static os_cpu_mask_t fio_gtod_cpumask;
 
 void fio_gtod_init(void)
 {
-	fio_tv = smalloc(sizeof(struct timeval));
-	assert(fio_tv);
+	if (fio_ts)
+		return;
+
+	fio_ts = smalloc(sizeof(*fio_ts));
+	if (!fio_ts)
+		log_err("fio: smalloc pool exhausted\n");
 }
 
 static void fio_gtod_update(void)
 {
-	gettimeofday(fio_tv, NULL);
+	if (fio_ts) {
+		struct timeval __tv;
+
+		gettimeofday(&__tv, NULL);
+		fio_ts->tv_sec = __tv.tv_sec;
+		write_barrier();
+		fio_ts->tv_nsec = __tv.tv_usec * 1000;
+		write_barrier();
+	}
 }
 
+struct gtod_cpu_data {
+	struct fio_mutex *mutex;
+	unsigned int cpu;
+};
+
 static void *gtod_thread_main(void *data)
 {
 	struct fio_mutex *mutex = data;
+	int ret;
+
+	ret = fio_setaffinity(gettid(), fio_gtod_cpumask);
 
 	fio_mutex_up(mutex);
 
+	if (ret == -1) {
+		log_err("gtod: setaffinity failed\n");
+		return NULL;
+	}
+
 	/*
 	 * As long as we have jobs around, update the clock. It would be nice
 	 * to have some way of NOT hammering that CPU with gettimeofday(),
@@ -53,8 +78,8 @@ int fio_start_gtod_thread(void)
 		return 1;
 
 	pthread_attr_init(&attr);
-	pthread_attr_setstacksize(&attr, PTHREAD_STACK_MIN);
-	ret = pthread_create(&gtod_thread, &attr, gtod_thread_main, NULL);
+	pthread_attr_setstacksize(&attr, 2 * PTHREAD_STACK_MIN);
+	ret = pthread_create(&gtod_thread, &attr, gtod_thread_main, mutex);
 	pthread_attr_destroy(&attr);
 	if (ret) {
 		log_err("Can't create gtod thread: %s\n", strerror(ret));
@@ -63,7 +88,7 @@ int fio_start_gtod_thread(void)
 
 	ret = pthread_detach(gtod_thread);
 	if (ret) {
-		log_err("Can't detatch gtod thread: %s\n", strerror(ret));
+		log_err("Can't detach gtod thread: %s\n", strerror(ret));
 		goto err;
 	}
 
@@ -75,4 +100,9 @@ err:
 	return ret;
 }
 
-
+void fio_gtod_set_cpu(unsigned int cpu)
+{
+#ifdef FIO_HAVE_CPU_AFFINITY
+	fio_cpu_set(&fio_gtod_cpumask, cpu);
+#endif
+}