The following changes since commit 282cc1676587eb155e331b31400d344821b0b850:
Add comment on why fallocate is disabled on AIX (2010-08-11 16:14:56 -0400)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (2):
Fixup misuse of get_cpu_clock()
Fio 1.43-rc1
gettime.c | 21 +++++++++++++++++----
init.c | 2 +-
time.c | 2 --
3 files changed, 18 insertions(+), 7 deletions(-)
---
Diff of recent changes:
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 @@ 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/init.c b/init.c
index c3fe88f..8ae91d7 100644
--- a/init.c
+++ b/init.c
@@ -22,7 +22,7 @@
#include "lib/getopt.h"
-static char fio_version_string[] = "fio 1.42";
+static char fio_version_string[] = "fio 1.43-rc1";
#define FIO_RANDSEED (0xb1899bedUL)
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 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)
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
