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 1ea7f59ca396d0c13d49372ccb26976bbed2d2d8..4b56ed7aaff00788a5fb4fbce712a146c5198a5d 100644 (file)
--- a/urcu/arch/generic.h
+++ b/urcu/arch/generic.h
@@ -23,6 +23,7 @@
 
 #include <urcu/compiler.h>
 #include <urcu/config.h>
+#include <urcu/syscall-compat.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -37,9 +38,9 @@ extern "C" {
 /*
  * Architectures with cache coherency must _not_ define cmm_mc/cmm_rmc/cmm_wmc.
  *
- * For them, cmm_mc/cmm_rmc/cmm_wmc are implemented with a * simple compiler barrier;
- * in addition, we provide defaults for cmm_mb (using GCC builtins) as well as
- * cmm_rmb and cmm_wmb (defaulting to cmm_mb).
+ * For them, cmm_mc/cmm_rmc/cmm_wmc are implemented with a simple
+ * compiler barrier; in addition, we provide defaults for cmm_mb (using
+ * GCC builtins) as well as cmm_rmb and cmm_wmb (defaulting to cmm_mb).
  */
 
 #ifndef cmm_mb
@@ -61,14 +62,14 @@ 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()
  *
- * Of these, only cmm_mc is mandatory.  cmm_rmc and cmm_wmc default to cmm_mc.  
- * cmm_mb/cmm_rmb/cmm_wmb use these definitions by default:
+ * Of these, only cmm_mc is mandatory. cmm_rmc and cmm_wmc default to
+ * cmm_mc. cmm_mb/cmm_rmb/cmm_wmb use these definitions by default:
  *
- * #define cmm_mb()            cmm_mc()
+ * #define cmm_mb()    cmm_mc()
  * #define cmm_rmb()   cmm_rmc()
  * #define cmm_wmb()   cmm_wmc()
  */
@@ -149,6 +150,58 @@ extern "C" {
 #define caa_cpu_relax()                cmm_barrier()
 #endif
 
+#ifndef HAS_CAA_GET_CYCLES
+#define HAS_CAA_GET_CYCLES
+
+#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)
+{
+       struct timespec ts;
+
+       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
 }
 #endif