Cpu clock does not wrap if there is no CPU clock

[fio.git] / gettime.c

diff --git a/gettime.c b/gettime.c
index 8419fe4bb9d2b46864c8f53909352936b420a4b1..180aa5f2ed6c3893235e85b8852d5e9a6673affd 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -13,12 +13,16 @@
 #include "hash.h"
 #include "os/os.h"
 
-#if defined(ARCH_HAVE_CPU_CLOCK) && !defined(ARCH_CPU_CLOCK_CYCLES_PER_USEC)
+#if defined(ARCH_HAVE_CPU_CLOCK)
+#ifndef ARCH_CPU_CLOCK_CYCLES_PER_USEC
 static unsigned long cycles_per_usec;
 static unsigned long inv_cycles_per_usec;
 static uint64_t max_cycles_for_mult;
+#endif
+#ifdef ARCH_CPU_CLOCK_WRAPS
 static unsigned long long cycles_start, cycles_wrap;
 #endif
+#endif
 int tsc_reliable = 0;
 
 struct tv_valid {
@@ -171,6 +175,7 @@ static void __fio_gettime(struct timeval *tp)
 #endif
 
                t = get_cpu_clock();
+#ifdef ARCH_CPU_CLOCK_WRAPS
                if (t < cycles_start && !cycles_wrap)
                        cycles_wrap = 1;
                else if (cycles_wrap && t >= cycles_start && !tv->warned) {
@@ -179,6 +184,7 @@ static void __fio_gettime(struct timeval *tp)
                }
 
                t -= cycles_start;
+#endif
                tv->last_cycles = t;
                tv->last_tv_valid = 1;
 #ifdef ARCH_CPU_CLOCK_CYCLES_PER_USEC
@@ -311,8 +317,10 @@ static int calibrate_cpu_clock(void)
        inv_cycles_per_usec = 16777216UL / cycles_per_usec;
        max_cycles_for_mult = ~0ULL / inv_cycles_per_usec;
        dprint(FD_TIME, "inv_cycles_per_usec=%lu\n", inv_cycles_per_usec);
+#ifdef ARCH_CPU_CLOCK_WRAPS
        cycles_start = get_cpu_clock();
        dprint(FD_TIME, "cycles_start=%llu\n", cycles_start);
+#endif
        return 0;
 }
 #else
@@ -478,7 +486,7 @@ static void *clock_thread_fn(void *data)
        int i;
 
        if (fio_cpuset_init(&cpu_mask)) {
-               int __err;
+               int __err = errno;
 
                log_err("clock cpuset init failed: %s\n", strerror(__err));
                goto err_out;
@@ -528,6 +536,7 @@ static void *clock_thread_fn(void *data)
        if (!t->entries[i - 1].tsc && !t->entries[0].tsc)
                goto err;
 
+       fio_cpuset_exit(&cpu_mask);
        return NULL;
 err:
        fio_cpuset_exit(&cpu_mask);