Fix: use clock_get_time for caa_get_cycles fallback on MacOSX

[urcu.git] / urcu / arch / generic.h

diff --git a/urcu/arch/generic.h b/urcu/arch/generic.h
index a80b3d6c13c1bb0e015837181d1e312380601c53..4b56ed7aaff00788a5fb4fbce712a146c5198a5d 100644 (file)
--- a/urcu/arch/generic.h
+++ b/urcu/arch/generic.h
@@ -62,7 +62,7 @@ extern "C" {
 /*
  * Architectures without cache coherency need something like the following:
  *
- * #define cmm_mc()    arch_cache_flush() 
+ * #define cmm_mc()    arch_cache_flush()
  * #define cmm_rmc()   arch_cache_flush_read()
  * #define cmm_wmc()   arch_cache_flush_write()
  *
@@ -152,18 +152,54 @@ extern "C" {
 
 #ifndef HAS_CAA_GET_CYCLES
 #define HAS_CAA_GET_CYCLES
-typedef unsigned long long cycles_t;
 
-static inline cycles_t caa_get_cycles (void)
+#ifdef CONFIG_RCU_HAVE_CLOCK_GETTIME
+
+#include <time.h>
+#include <stdint.h>
+
+typedef uint64_t caa_cycles_t;
+
+static inline caa_cycles_t caa_get_cycles (void)
 {
-       cycles_t thetime;
-       struct timeval tv;
+       struct timespec ts;
 
-       if (gettimeofday(&tv, NULL) != 0)
-               return 0;
-       thetime = ((cycles_t)tv.tv_sec) * 1000000ULL + ((cycles_t)tv.tv_usec);
-       return (cycles_t)thetime;
+       if (caa_unlikely(clock_gettime(CLOCK_MONOTONIC, &ts)))
+               return -1ULL;
+       return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
 }
+
+#elif defined(__APPLE__)
+
+#include <mach/mach.h>
+#include <mach/clock.h>
+#include <mach/mach_time.h>
+#include <time.h>
+#include <stdint.h>
+
+typedef uint64_t caa_cycles_t;
+
+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)))
+               return -1ULL;
+       return ((uint64_t) ts.tv_sec * 1000000000ULL) + ts.tv_nsec;
+}
+
+#else
+
+#error caa_get_cycles() not implemented for this platform.
+
+#endif
+
 #endif /* HAS_CAA_GET_CYCLES */
 
 #ifdef __cplusplus