Fixup misuse of get_cpu_clock()
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
diff --git a/gettime.c b/gettime.c
index 08d2d2b..0ad8d92 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 @@
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 @@
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 @@
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 5755b67..7015fd5 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 set_genesis_time(void)
{
fio_gettime(&genesis, NULL);
- genesis_cycles = get_cpu_clock();
}
void fill_start_time(struct timeval *t)