HOWTO: add description and examples of verify triggers

[fio.git] / gettime.c

diff --git a/gettime.c b/gettime.c
index 1a0f827460c9da6562678733f041be73c2eec484..6a7e35f87249905c044165bfe1869f4ac0605e99 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -13,7 +13,7 @@
 #include "hash.h"
 #include "os/os.h"
 
-#ifdef ARCH_HAVE_CPU_CLOCK
+#if defined(ARCH_HAVE_CPU_CLOCK) && !defined(ARCH_CPU_CLOCK_CYCLES_PER_USEC)
 static unsigned long cycles_per_usec;
 static unsigned long inv_cycles_per_usec;
 #endif
@@ -32,7 +32,7 @@ static pthread_key_t tv_tls_key;
 
 enum fio_cs fio_clock_source = FIO_PREFERRED_CLOCK_SOURCE;
 int fio_clock_source_set = 0;
-enum fio_cs fio_clock_source_inited = CS_INVAL;
+static enum fio_cs fio_clock_source_inited = CS_INVAL;
 
 #ifdef FIO_DEBUG_TIME
 
@@ -177,7 +177,11 @@ static void *__fio_gettime(struct timeval *tp)
                } else if (tv)
                        tv->last_cycles = t;
 
+#ifdef ARCH_CPU_CLOCK_CYCLES_PER_USEC
+               usecs = t / ARCH_CPU_CLOCK_CYCLES_PER_USEC;
+#else
                usecs = (t * inv_cycles_per_usec) / 16777216UL;
+#endif
                tp->tv_sec = usecs / 1000000;
                tp->tv_usec = usecs % 1000000;
                break;
@@ -205,7 +209,7 @@ void fio_gettime(struct timeval *tp, void fio_unused *caller)
 
        gtod_log_caller(caller);
 #endif
-       if (fio_tv) {
+       if (fio_unlikely(fio_tv)) {
                memcpy(tp, fio_tv, sizeof(*tp));
                return;
        }
@@ -229,7 +233,7 @@ void fio_gettime(struct timeval *tp, void fio_unused *caller)
        }
 }
 
-#ifdef ARCH_HAVE_CPU_CLOCK
+#if defined(ARCH_HAVE_CPU_CLOCK) && !defined(ARCH_CPU_CLOCK_CYCLES_PER_USEC)
 static unsigned long get_cycles_per_usec(void)
 {
        struct timeval s, e;
@@ -318,16 +322,20 @@ static int calibrate_cpu_clock(void)
 #else
 static int calibrate_cpu_clock(void)
 {
+#ifdef ARCH_CPU_CLOCK_CYCLES_PER_USEC
+       return 0;
+#else
        return 1;
-}
 #endif
+}
+#endif // ARCH_HAVE_CPU_CLOCK
 
 #ifndef CONFIG_TLS_THREAD
 void fio_local_clock_init(int is_thread)
 {
        struct tv_valid *t;
 
-       t = calloc(sizeof(*t), 1);
+       t = calloc(1, sizeof(*t));
        if (pthread_setspecific(tv_tls_key, t))
                log_err("fio: can't set TLS key\n");
 }
@@ -369,7 +377,7 @@ void fio_clock_init(void)
                log_info("fio: clocksource=cpu may not be reliable\n");
 }
 
-uint64_t utime_since(struct timeval *s, struct timeval *e)
+uint64_t utime_since(const struct timeval *s, const struct timeval *e)
 {
        long sec, usec;
        uint64_t ret;
@@ -392,7 +400,7 @@ uint64_t utime_since(struct timeval *s, struct timeval *e)
        return ret;
 }
 
-uint64_t utime_since_now(struct timeval *s)
+uint64_t utime_since_now(const struct timeval *s)
 {
        struct timeval t;
 
@@ -400,7 +408,7 @@ uint64_t utime_since_now(struct timeval *s)
        return utime_since(s, &t);
 }
 
-uint64_t mtime_since(struct timeval *s, struct timeval *e)
+uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
 {
        long sec, usec, ret;
 
@@ -421,7 +429,7 @@ uint64_t mtime_since(struct timeval *s, struct timeval *e)
        return ret;
 }
 
-uint64_t mtime_since_now(struct timeval *s)
+uint64_t mtime_since_now(const struct timeval *s)
 {
        struct timeval t;
        void *p = __builtin_return_address(0);
@@ -430,7 +438,7 @@ uint64_t mtime_since_now(struct timeval *s)
        return mtime_since(s, &t);
 }
 
-uint64_t time_since_now(struct timeval *s)
+uint64_t time_since_now(const struct timeval *s)
 {
        return mtime_since_now(s) / 1000;
 }
@@ -523,28 +531,32 @@ static int clock_cmp(const void *p1, const void *p2)
 
 int fio_monotonic_clocktest(void)
 {
-       struct clock_thread *threads;
+       struct clock_thread *cthreads;
        unsigned int nr_cpus = cpus_online();
        struct clock_entry *entries;
-       unsigned long tentries, failed;
+       unsigned long tentries, failed = 0;
        struct clock_entry *prev, *this;
        uint32_t seq = 0;
-       int i;
+       unsigned int i;
 
        log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no");
 
+#ifdef FIO_INC_DEBUG
        fio_debug |= 1U << FD_TIME;
+#endif
        calibrate_cpu_clock();
+#ifdef FIO_INC_DEBUG
        fio_debug &= ~(1U << FD_TIME);
+#endif
 
-       threads = malloc(nr_cpus * sizeof(struct clock_thread));
+       cthreads = malloc(nr_cpus * sizeof(struct clock_thread));
        tentries = CLOCK_ENTRIES * nr_cpus;
        entries = malloc(tentries * sizeof(struct clock_entry));
 
        log_info("cs: Testing %u CPUs\n", nr_cpus);
 
        for (i = 0; i < nr_cpus; i++) {
-               struct clock_thread *t = &threads[i];
+               struct clock_thread *t = &cthreads[i];
 
                t->cpu = i;
                t->seq = &seq;
@@ -552,30 +564,34 @@ int fio_monotonic_clocktest(void)
                pthread_mutex_init(&t->lock, NULL);
                pthread_mutex_init(&t->started, NULL);
                pthread_mutex_lock(&t->lock);
-               pthread_create(&t->thread, NULL, clock_thread_fn, t);
+               if (pthread_create(&t->thread, NULL, clock_thread_fn, t)) {
+                       failed++;
+                       nr_cpus = i;
+                       break;
+               }
        }
 
        for (i = 0; i < nr_cpus; i++) {
-               struct clock_thread *t = &threads[i];
+               struct clock_thread *t = &cthreads[i];
 
                pthread_mutex_lock(&t->started);
        }
 
        for (i = 0; i < nr_cpus; i++) {
-               struct clock_thread *t = &threads[i];
+               struct clock_thread *t = &cthreads[i];
 
                pthread_mutex_unlock(&t->lock);
        }
 
-       for (failed = i = 0; i < nr_cpus; i++) {
-               struct clock_thread *t = &threads[i];
+       for (i = 0; i < nr_cpus; i++) {
+               struct clock_thread *t = &cthreads[i];
                void *ret;
 
                pthread_join(t->thread, &ret);
                if (ret)
                        failed++;
        }
-       free(threads);
+       free(cthreads);
 
        if (failed) {
                log_err("Clocksource test: %lu threads failed\n", failed);