X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Farch%2Fgeneric.h;h=4b56ed7aaff00788a5fb4fbce712a146c5198a5d;hp=e53ac564d5753216bd6400829deae651c03cf409;hb=a0307b90e502a48cc73ca936bce0792f5566ba64;hpb=67ecffc0f530a7b5c4dd5111ea7dd3213da8eb91

diff --git a/urcu/arch/generic.h b/urcu/arch/generic.h
index e53ac56..4b56ed7 100644
--- a/urcu/arch/generic.h
+++ b/urcu/arch/generic.h
@@ -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