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 19541b474b75878999657475f88d46178ad7c831..fc52236bf5969028aabec5c0507f445e91298d65 100644 (file)
--- a/gettime-thread.c
+++ b/gettime-thread.c
@@ -6,30 +6,30 @@
 #include "fio.h"
 #include "smalloc.h"
 
-struct timeval *fio_tv = NULL;
+struct timespec *fio_ts = NULL;
 int fio_gtod_offload = 0;
 static pthread_t gtod_thread;
 static os_cpu_mask_t fio_gtod_cpumask;
 
 void fio_gtod_init(void)
 {
-       if (fio_tv)
+       if (fio_ts)
                return;
 
-       fio_tv = smalloc(sizeof(struct timeval));
-       if (!fio_tv)
+       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();
        }
 }
@@ -42,10 +42,17 @@ struct gtod_cpu_data {
 static void *gtod_thread_main(void *data)
 {
        struct fio_mutex *mutex = data;
+       int ret;
+
+       ret = fio_setaffinity(gettid(), fio_gtod_cpumask);
 
-       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(),