projects
/
fio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: fix missing comma in fio_server_ops[] strings
[fio.git]
/
gettime.c
diff --git
a/gettime.c
b/gettime.c
index b89cd46fdd14e7cbe6290a424416b6268a6543d8..98e83b85a6b55ef2a059ced730459e1f9c1697a2 100644
(file)
--- a/
gettime.c
+++ b/
gettime.c
@@
-13,7
+13,7
@@
#include "hash.h"
#include "os/os.h"
#include "hash.h"
#include "os/os.h"
-#if
def 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
static unsigned long cycles_per_usec;
static unsigned long inv_cycles_per_usec;
#endif
@@
-177,7
+177,11
@@
static void *__fio_gettime(struct timeval *tp)
} else if (tv)
tv->last_cycles = t;
} 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;
usecs = (t * inv_cycles_per_usec) / 16777216UL;
+#endif
tp->tv_sec = usecs / 1000000;
tp->tv_usec = usecs % 1000000;
break;
tp->tv_sec = usecs / 1000000;
tp->tv_usec = usecs % 1000000;
break;
@@
-229,7
+233,7
@@
void fio_gettime(struct timeval *tp, void fio_unused *caller)
}
}
}
}
-#if
def 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;
static unsigned long get_cycles_per_usec(void)
{
struct timeval s, e;
@@
-318,9
+322,13
@@
static int calibrate_cpu_clock(void)
#else
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;
return 1;
-}
#endif
#endif
+}
+#endif // ARCH_HAVE_CPU_CLOCK
#ifndef CONFIG_TLS_THREAD
void fio_local_clock_init(int is_thread)
#ifndef CONFIG_TLS_THREAD
void fio_local_clock_init(int is_thread)
@@
-529,7
+537,7
@@
int fio_monotonic_clocktest(void)
unsigned long tentries, failed;
struct clock_entry *prev, *this;
uint32_t seq = 0;
unsigned long tentries, failed;
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");
log_info("cs: reliable_tsc: %s\n", tsc_reliable ? "yes" : "no");