fio: Fix (unsigned) integer overflow issues

[fio.git] / gettime.c

diff --git a/gettime.c b/gettime.c
index ac541113245fb49876ed2afa601894cff3ca776c..85ba7cba8954aa3a70ae5e1faf9a76ab6ab22c72 100644 (file)
--- a/gettime.c
+++ b/gettime.c
@@ -232,6 +232,7 @@ static unsigned long get_cycles_per_usec(void)
        struct timeval s, e;
        uint64_t c_s, c_e;
        enum fio_cs old_cs = fio_clock_source;
+       uint64_t elapsed;
 
 #ifdef CONFIG_CLOCK_GETTIME
        fio_clock_source = CS_CGETTIME;
@@ -242,8 +243,6 @@ static unsigned long get_cycles_per_usec(void)
 
        c_s = get_cpu_clock();
        do {
-               uint64_t elapsed;
-
                __fio_gettime(&e);
 
                elapsed = utime_since(&s, &e);
@@ -254,7 +253,7 @@ static unsigned long get_cycles_per_usec(void)
        } while (1);
 
        fio_clock_source = old_cs;
-       return (c_e - c_s + 127) >> 7;
+       return (c_e - c_s) / elapsed;
 }
 
 #define NR_TIME_ITERS  50
@@ -300,16 +299,11 @@ static int calibrate_cpu_clock(void)
        }
 
        S /= (double) NR_TIME_ITERS;
-       mean /= 10.0;
 
        for (i = 0; i < NR_TIME_ITERS; i++)
-               dprint(FD_TIME, "cycles[%d]=%llu\n", i,
-                                       (unsigned long long) cycles[i] / 10);
+               dprint(FD_TIME, "cycles[%d]=%llu\n", i, (unsigned long long) cycles[i]);
 
        avg /= samples;
-       avg = (avg + 5) / 10;
-       minc /= 10;
-       maxc /= 10;
        dprint(FD_TIME, "avg: %llu\n", (unsigned long long) avg);
        dprint(FD_TIME, "min=%llu, max=%llu, mean=%f, S=%f\n",
                        (unsigned long long) minc,
@@ -387,8 +381,7 @@ void fio_clock_init(void)
 
 uint64_t utime_since(const struct timeval *s, const struct timeval *e)
 {
-       long sec, usec;
-       uint64_t ret;
+       int64_t sec, usec;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -403,9 +396,7 @@ uint64_t utime_since(const struct timeval *s, const struct timeval *e)
        if (sec < 0 || (sec == 0 && usec < 0))
                return 0;
 
-       ret = sec * 1000000ULL + usec;
-
-       return ret;
+       return usec + (sec * 1000000);
 }
 
 uint64_t utime_since_now(const struct timeval *s)
@@ -418,7 +409,7 @@ uint64_t utime_since_now(const struct timeval *s)
 
 uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
 {
-       long sec, usec, ret;
+       long sec, usec;
 
        sec = e->tv_sec - s->tv_sec;
        usec = e->tv_usec - s->tv_usec;
@@ -430,11 +421,9 @@ uint64_t mtime_since(const struct timeval *s, const struct timeval *e)
        if (sec < 0 || (sec == 0 && usec < 0))
                return 0;
 
-       sec *= 1000UL;
-       usec /= 1000UL;
-       ret = sec + usec;
-
-       return ret;
+       sec *= 1000;
+       usec /= 1000;
+       return sec + usec;
 }
 
 uint64_t mtime_since_now(const struct timeval *s)
@@ -485,6 +474,7 @@ static void *clock_thread_fn(void *data)
        struct clock_entry *c;
        os_cpu_mask_t cpu_mask;
        uint32_t last_seq;
+       unsigned long long first;
        int i;
 
        if (fio_cpuset_init(&cpu_mask)) {
@@ -506,6 +496,7 @@ static void *clock_thread_fn(void *data)
        pthread_mutex_lock(&t->lock);
        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++) {
@@ -528,7 +519,8 @@ static void *clock_thread_fn(void *data)
                unsigned long long clocks;
 
                clocks = t->entries[i - 1].tsc - t->entries[0].tsc;
-               log_info("cs: cpu%3d: %llu clocks seen\n", t->cpu, clocks);
+               log_info("cs: cpu%3d: %llu clocks seen, first %llu\n", t->cpu,
+                                                       clocks, first);
        }
 
        /*
@@ -640,6 +632,8 @@ int fio_monotonic_clocktest(int debug)
 
        qsort(entries, tentries, sizeof(struct clock_entry), clock_cmp);
 
+       /* silence silly gcc */
+       prev = NULL;
        for (failed = i = 0; i < tentries; i++) {
                this = &entries[i];