summaryrefslogtreecommitdiff
path: root/gettime.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2014-12-17 09:08:01 -0700
committerJens Axboe <axboe@fb.com>2014-12-17 09:08:01 -0700
commit03be65c96360db94cde247bd46f523dfe5e61d12 (patch)
tree250f877e56e3893d17a89b02c3927f1b8933baf4 /gettime.c
parent73df3e072e210c93934d21668cc8adba4ae74d77 (diff)
downloadfio-03be65c96360db94cde247bd46f523dfe5e61d12.tar.gz
fio-03be65c96360db94cde247bd46f523dfe5e61d12.tar.bz2
gettime: fix compile warning for !ARCH_HAVE_CPU_CLOCK
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'gettime.c')
-rw-r--r--gettime.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/gettime.c b/gettime.c
index a95b5452..172b4782 100644
--- a/gettime.c
+++ b/gettime.c
@@ -26,11 +26,13 @@ struct tv_valid {
int last_tv_valid;
int warned;
};
+#ifdef ARCH_HAVE_CPU_CLOCK
#ifdef CONFIG_TLS_THREAD
static __thread struct tv_valid static_tv_valid;
#else
static pthread_key_t tv_tls_key;
#endif
+#endif
enum fio_cs fio_clock_source = FIO_PREFERRED_CLOCK_SOURCE;
int fio_clock_source_set = 0;
@@ -137,14 +139,6 @@ static int fill_clock_gettime(struct timespec *ts)
static void __fio_gettime(struct timeval *tp)
{
- struct tv_valid *tv;
-
-#ifdef CONFIG_TLS_THREAD
- tv = &static_tv_valid;
-#else
- tv = pthread_getspecific(tv_tls_key);
-#endif
-
switch (fio_clock_source) {
#ifdef CONFIG_GETTIMEOFDAY
case CS_GTOD:
@@ -168,15 +162,20 @@ static void __fio_gettime(struct timeval *tp)
#ifdef ARCH_HAVE_CPU_CLOCK
case CS_CPUCLOCK: {
uint64_t usecs, t;
+ struct tv_valid *tv;
+
+#ifdef CONFIG_TLS_THREAD
+ tv = &static_tv_valid;
+#else
+ tv = pthread_getspecific(tv_tls_key);
+#endif
t = get_cpu_clock();
if (t < cycles_start && !cycles_wrap)
cycles_wrap = 1;
- else if (cycles_wrap && t >= cycles_start) {
- if (!tv->warned) {
- log_err("fio: double CPU clock wrap\n");
- tv->warned = 1;
- }
+ else if (cycles_wrap && t >= cycles_start && !tv->warned) {
+ log_err("fio: double CPU clock wrap\n");
+ tv->warned = 1;
}
t -= cycles_start;