X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fgetcpu.h;h=fbddb7989336b71235ba238eff9ae860c41a3d6e;hb=99d544c7387a4a07d6b7cbdb70c34d486c6d9d9e;hp=104ba7601c6bc58598833d4e7acc9374e6262e4f;hpb=e4486ebcdee39064492ed386b11008191fbbad17;p=lttng-ust.git

diff --git a/libringbuffer/getcpu.h b/libringbuffer/getcpu.h
index 104ba760..fbddb798 100644
--- a/libringbuffer/getcpu.h
+++ b/libringbuffer/getcpu.h
@@ -20,9 +20,14 @@
  */
 
 #include <urcu/compiler.h>
-#include <sched.h>
+#include <urcu/system.h>
+#include <urcu/arch.h>
+
+void lttng_ust_getcpu_init(void);
+
+extern int (*lttng_get_cpu)(void);
 
-#ifdef UST_VALGRIND
+#ifdef LTTNG_UST_DEBUG_VALGRIND
 
 /*
  * Fallback on cpu 0 if liblttng-ust is build with Valgrind support.
@@ -30,18 +35,45 @@
  * migration, so it is only statistically accurate.
  */
 static inline
-int lttng_ust_get_cpu(void)
+int lttng_ust_get_cpu_internal(void)
 {
 	return 0;
 }
 
 #else
 
+/*
+ * sched_getcpu.
+ */
+#ifdef __linux__
+
+/* old uClibc versions didn't have sched_getcpu */
+#if defined(__UCLIBC__) && __UCLIBC_MAJOR__ == 0 && \
+	(__UCLIBC_MINOR__ < 9 || \
+	 (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32))
+#include <sys/syscall.h>
+#define __getcpu(cpu, node, cache)	syscall(__NR_getcpu, cpu, node, cache)
 /*
  * If getcpu is not implemented in the kernel, use cpu 0 as fallback.
  */
 static inline
-int lttng_ust_get_cpu(void)
+int lttng_ust_get_cpu_internal(void)
+{
+	int cpu, ret;
+
+	ret = __getcpu(&cpu, NULL, NULL);
+	if (caa_unlikely(ret < 0))
+		return 0;
+	return c;
+}
+#else /* __UCLIBC__ */
+#include <sched.h>
+
+/*
+ * If getcpu is not implemented in the kernel, use cpu 0 as fallback.
+ */
+static inline
+int lttng_ust_get_cpu_internal(void)
 {
 	int cpu;
 
@@ -50,7 +82,36 @@ int lttng_ust_get_cpu(void)
 		return 0;
 	return cpu;
 }
+#endif	/* __UCLIBC__ */
 
+#elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+
+/*
+ * FreeBSD and Cygwin do not allow query of CPU ID. Always use CPU
+ * number 0, with the assocated performance degradation on SMP.
+ */
+static inline
+int lttng_ust_get_cpu_internal(void)
+{
+	return 0;
+}
+
+#else
+#error "Please add support for your OS into liblttng-ust/compat.h."
 #endif
 
+#endif
+
+static inline
+int lttng_ust_get_cpu(void)
+{
+	int (*getcpu)(void) = CMM_LOAD_SHARED(lttng_get_cpu);
+
+	if (caa_likely(!getcpu)) {
+		return lttng_ust_get_cpu_internal();
+	} else {
+		return getcpu();
+	}
+}
+
 #endif /* _LTTNG_GETCPU_H */