X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=gettime-thread.c;h=86c2e2efdcdcd796bd280951b5f0170ebe5a8db8;hp=72cc4d8a472783f7e73d7d40f8a8da9f56759a2a;hb=515418094c61cf135513a34651af6134a8794b5d;hpb=27325ed5a4f770b681c6847352c547d51dbdeb62

diff --git a/gettime-thread.c b/gettime-thread.c
index 72cc4d8a..86c2e2ef 100644
--- a/gettime-thread.c
+++ b/gettime-thread.c
@@ -1,41 +1,56 @@
-#include <unistd.h>
-#include <math.h>
 #include <sys/time.h>
 #include <time.h>
 
 #include "fio.h"
+#include "lib/seqlock.h"
 #include "smalloc.h"
 
-struct timeval *fio_tv = NULL;
+struct fio_ts *fio_ts;
 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));
-	if (!fio_tv)
-		log_err("fio: smalloc pool exhausted\n");
+	if (fio_ts)
+		return;
+
+	fio_ts = smalloc(sizeof(*fio_ts));
 }
 
 static void fio_gtod_update(void)
 {
-	if (fio_tv) {
-		struct timeval __tv;
-
-		gettimeofday(&__tv, NULL);
-		fio_tv->tv_sec = __tv.tv_sec;
-		write_barrier();
-		fio_tv->tv_usec = __tv.tv_usec;
-		write_barrier();
-	}
+	struct timeval __tv;
+
+	if (!fio_ts)
+		return;
+
+	gettimeofday(&__tv, NULL);
+
+	write_seqlock_begin(&fio_ts->seqlock);
+	fio_ts->ts.tv_sec = __tv.tv_sec;
+	fio_ts->ts.tv_nsec = __tv.tv_usec * 1000;
+	write_seqlock_end(&fio_ts->seqlock);
 }
 
+struct gtod_cpu_data {
+	struct fio_sem *sem;
+	unsigned int cpu;
+};
+
 static void *gtod_thread_main(void *data)
 {
-	struct fio_mutex *mutex = data;
+	struct fio_sem *sem = data;
+	int ret;
 
-	fio_mutex_up(mutex);
+	ret = fio_setaffinity(gettid(), fio_gtod_cpumask);
+
+	fio_sem_up(sem);
+
+	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
@@ -43,7 +58,7 @@ static void *gtod_thread_main(void *data)
 	 * but I'm not sure what to use outside of a simple CPU nop to relax
 	 * it - we don't want to lose precision.
 	 */
-	while (threads) {
+	while (nr_segments) {
 		fio_gtod_update();
 		nop;
 	}
@@ -53,17 +68,17 @@ static void *gtod_thread_main(void *data)
 
 int fio_start_gtod_thread(void)
 {
-	struct fio_mutex *mutex;
+	struct fio_sem *sem;
 	pthread_attr_t attr;
 	int ret;
 
-	mutex = fio_mutex_init(FIO_MUTEX_LOCKED);
-	if (!mutex)
+	sem = fio_sem_init(FIO_SEM_LOCKED);
+	if (!sem)
 		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, sem);
 	pthread_attr_destroy(&attr);
 	if (ret) {
 		log_err("Can't create gtod thread: %s\n", strerror(ret));
@@ -72,16 +87,21 @@ 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;
 	}
 
-	dprint(FD_MUTEX, "wait on startup_mutex\n");
-	fio_mutex_down(mutex);
-	dprint(FD_MUTEX, "done waiting on startup_mutex\n");
+	dprint(FD_MUTEX, "wait on startup_sem\n");
+	fio_sem_down(sem);
+	dprint(FD_MUTEX, "done waiting on startup_sem\n");
 err:
-	fio_mutex_remove(mutex);
+	fio_sem_remove(sem);
 	return ret;
 }
 
-
+void fio_gtod_set_cpu(unsigned int cpu)
+{
+#ifdef FIO_HAVE_CPU_AFFINITY
+	fio_cpu_set(&fio_gtod_cpumask, cpu);
+#endif
+}