Split mutex.c and .h each into three files

[fio.git] / gettime-thread.c

diff --git a/gettime-thread.c b/gettime-thread.c
index 72cc4d8a472783f7e73d7d40f8a8da9f56759a2a..fc52236bf5969028aabec5c0507f445e91298d65 100644 (file)
--- a/gettime-thread.c
+++ b/gettime-thread.c
@@ -6,37 +6,53 @@
 #include "fio.h"
 #include "smalloc.h"
 
-struct timeval *fio_tv = NULL;
+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));
-       if (!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)
 {
-       if (fio_tv) {
+       if (fio_ts) {
                struct timeval __tv;
 
                gettimeofday(&__tv, NULL);
-               fio_tv->tv_sec = __tv.tv_sec;
+               fio_ts->tv_sec = __tv.tv_sec;
                write_barrier();
-               fio_tv->tv_usec = __tv.tv_usec;
+               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(),
@@ -62,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));
@@ -72,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;
        }
 
@@ -84,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
+}