gettime-thread: fix failure to check setaffinity return value

[fio.git] / gettime.c

diff --git a/gettime.c b/gettime.c
index a14a179bd14e49bc47e5fdb0f118a40ac7edbe0e..c256a96c16c8f26253a253c82d23d23f4a5d914c 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -15,7 +15,7 @@
 
 #if defined(ARCH_HAVE_CPU_CLOCK)
 #ifndef ARCH_CPU_CLOCK_CYCLES_PER_USEC
-static unsigned long cycles_per_msec;
+static unsigned long long cycles_per_msec;
 static unsigned long long cycles_start;
 static unsigned long long clock_mult;
 static unsigned long long max_cycles_mask;
@@ -28,7 +28,7 @@ static unsigned int max_cycles_shift;
 static unsigned int cycles_wrap;
 #endif
 #endif
-int tsc_reliable = 0;
+bool tsc_reliable = false;
 
 struct tv_valid {
        int warned;
@@ -413,7 +413,7 @@ void fio_clock_init(void)
        fio_clock_source_inited = fio_clock_source;
 
        if (calibrate_cpu_clock())
-               tsc_reliable = 0;
+               tsc_reliable = false;
 
        /*
         * If the arch sets tsc_reliable != 0, then it must be good enough
@@ -425,6 +425,7 @@ void fio_clock_init(void)
                        fio_clock_source = CS_CPUCLOCK;
        } else if (fio_clock_source == CS_CPUCLOCK)
                log_info("fio: clocksource=cpu may not be reliable\n");
+       dprint(FD_TIME, "gettime: clocksource=%d\n", (int) fio_clock_source);
 }
 
 uint64_t ntime_since(const struct timespec *s, const struct timespec *e)
@@ -447,6 +448,14 @@ uint64_t ntime_since(const struct timespec *s, const struct timespec *e)
        return nsec + (sec * 1000000000LL);
 }
 
+uint64_t ntime_since_now(const struct timespec *s)
+{
+       struct timespec now;
+
+       fio_gettime(&now, NULL);
+       return ntime_since(s, &now);
+}
+
 uint64_t utime_since(const struct timespec *s, const struct timespec *e)
 {
        int64_t sec, usec;
@@ -539,10 +548,10 @@ uint64_t time_since_now(const struct timespec *s)
 }
 
 #if defined(FIO_HAVE_CPU_AFFINITY) && defined(ARCH_HAVE_CPU_CLOCK)  && \
-    defined(CONFIG_SFAA)
+    defined(CONFIG_SYNC_SYNC) && defined(CONFIG_CMP_SWAP)
 
 #define CLOCK_ENTRIES_DEBUG    100000
-#define CLOCK_ENTRIES_TEST     10000
+#define CLOCK_ENTRIES_TEST     1000
 
 struct clock_entry {
        uint32_t seq;
@@ -561,9 +570,10 @@ struct clock_thread {
        struct clock_entry *entries;
 };
 
-static inline uint32_t atomic32_inc_return(uint32_t *seq)
+static inline uint32_t atomic32_compare_and_swap(uint32_t *ptr, uint32_t old,
+                                                uint32_t new)
 {
-       return 1 + __sync_fetch_and_add(seq, 1);
+       return __sync_val_compare_and_swap(ptr, old, new);
 }
 
 static void *clock_thread_fn(void *data)
@@ -571,7 +581,6 @@ static void *clock_thread_fn(void *data)
        struct clock_thread *t = data;
        struct clock_entry *c;
        os_cpu_mask_t cpu_mask;
-       uint32_t last_seq;
        unsigned long long first;
        int i;
 
@@ -595,7 +604,6 @@ static void *clock_thread_fn(void *data)
        pthread_mutex_unlock(&t->started);
 
        first = get_cpu_clock();
-       last_seq = 0;
        c = &t->entries[0];
        for (i = 0; i < t->nr_entries; i++, c++) {
                uint32_t seq;
@@ -603,11 +611,15 @@ static void *clock_thread_fn(void *data)
 
                c->cpu = t->cpu;
                do {
-                       seq = atomic32_inc_return(t->seq);
-                       if (seq < last_seq)
+                       seq = *t->seq;
+                       if (seq == UINT_MAX)
                                break;
+                       __sync_synchronize();
                        tsc = get_cpu_clock();
-               } while (seq != *t->seq);
+               } while (seq != atomic32_compare_and_swap(t->seq, seq, seq + 1));
+
+               if (seq == UINT_MAX)
+                       break;
 
                c->seq = seq;
                c->tsc = tsc;
@@ -625,7 +637,7 @@ static void *clock_thread_fn(void *data)
         * The most common platform clock breakage is returning zero
         * indefinitely. Check for that and return failure.
         */
-       if (!t->entries[i - 1].tsc && !t->entries[0].tsc)
+       if (i > 1 && !t->entries[i - 1].tsc && !t->entries[0].tsc)
                goto err;
 
        fio_cpuset_exit(&cpu_mask);