Newer version of macOs have an implementation of clock_gettime() that
requires additionnal setup, move the platform specific code first so it
is always used.
Change-Id: I12fcdeff6c0ae59bc1a13f4e2cd7f4ebcedfc253
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
#ifndef HAS_CAA_GET_CYCLES
#define HAS_CAA_GET_CYCLES
#ifndef HAS_CAA_GET_CYCLES
#define HAS_CAA_GET_CYCLES
-#ifdef CONFIG_RCU_HAVE_CLOCK_GETTIME
+#include <mach/mach.h>
+#include <mach/clock.h>
+#include <mach/mach_time.h>
#include <time.h>
#include <stdint.h>
#include <time.h>
#include <stdint.h>
static inline caa_cycles_t caa_get_cycles (void)
{
static inline caa_cycles_t caa_get_cycles (void)
{
+ mach_timespec_t ts = { 0, 0 };
+ static clock_serv_t clock_service;
- if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts)))
+ if (caa_unlikely(!clock_service)) {
+ if (host_get_clock_service(mach_host_self(),
+ SYSTEM_CLOCK, &clock_service))
+ return -1ULL;
+ }
+ if (caa_unlikely(clock_get_time(clock_service, &ts)))
return -1ULL;
return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
}
return -1ULL;
return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
}
-#elif defined(__APPLE__)
+#elif defined(CONFIG_RCU_HAVE_CLOCK_GETTIME)
-#include <mach/mach.h>
-#include <mach/clock.h>
-#include <mach/mach_time.h>
#include <time.h>
#include <stdint.h>
#include <time.h>
#include <stdint.h>
static inline caa_cycles_t caa_get_cycles (void)
{
static inline caa_cycles_t caa_get_cycles (void)
{
- mach_timespec_t ts = { 0, 0 };
- static clock_serv_t clock_service;
- if (caa_unlikely(!clock_service)) {
- if (host_get_clock_service(mach_host_self(),
- SYSTEM_CLOCK, &clock_service))
- return -1ULL;
- }
- if (caa_unlikely(clock_get_time(clock_service, &ts)))
+ if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts)))
return -1ULL;
return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
}
return -1ULL;
return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
}