From 09a324028d68c485a8c4b33257b262123c27394f Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Sun, 15 Aug 2010 15:01:51 -0400 Subject: [PATCH 1/1] Fixup misuse of get_cpu_clock() Signed-off-by: Jens Axboe --- gettime.c | 21 +++++++++++++++++---- time.c | 2 -- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gettime.c b/gettime.c index 08d2d2b3..0ad8d924 100644 --- a/gettime.c +++ b/gettime.c @@ -11,9 +11,11 @@ #include "hash.h" +#ifdef ARCH_HAVE_CPU_CLOCK static unsigned long cycles_per_usec; -static struct timeval last_tv; static unsigned long last_cycles; +#endif +static struct timeval last_tv; static int last_tv_valid; static struct timeval *fio_tv; @@ -183,6 +185,7 @@ void fio_gettime(struct timeval *tp, void fio_unused *caller) memcpy(&last_tv, tp, sizeof(*tp)); } +#ifdef ARCH_HAVE_CPU_CLOCK static unsigned long get_cycles_per_usec(void) { struct timeval s, e; @@ -204,14 +207,12 @@ static unsigned long get_cycles_per_usec(void) return c_e - c_s; } -void fio_clock_init(void) +static void calibrate_cpu_clock(void) { double delta, mean, S; unsigned long avg, cycles[10]; int i, samples; - last_tv_valid = 0; - cycles[0] = get_cycles_per_usec(); S = delta = mean = 0.0; for (i = 0; i < 10; i++) { @@ -246,6 +247,18 @@ void fio_clock_init(void) dprint(FD_TIME, "mean=%f, S=%f\n", mean, S); cycles_per_usec = avg; + +} +#else +static void calibrate_cpu_clock(void) +{ +} +#endif + +void fio_clock_init(void) +{ + last_tv_valid = 0; + calibrate_cpu_clock(); } void fio_gtod_init(void) diff --git a/time.c b/time.c index 5755b67e..7015fd51 100644 --- a/time.c +++ b/time.c @@ -5,7 +5,6 @@ static struct timeval genesis; static unsigned long ns_granularity; -unsigned long long genesis_cycles; unsigned long long utime_since(struct timeval *s, struct timeval *e) { @@ -180,7 +179,6 @@ void fio_init fio_time_init(void) void set_genesis_time(void) { fio_gettime(&genesis, NULL); - genesis_cycles = get_cpu_clock(); } void fill_start_time(struct timeval *t) -- 2.25.1