Implement lttng_ust_get_cpu()

[lttng-ust.git] / libringbuffer / smp.h

diff --git a/libringbuffer/smp.h b/libringbuffer/smp.h
index 755c65fc52fb53e91ee59ddbd415cc0468cec2bf..bef3e0ef7ff467c01e6937b70bcf3608eb9f51ac 100644 (file)
--- a/libringbuffer/smp.h
+++ b/libringbuffer/smp.h
@@ -10,6 +10,7 @@
  */
 
 #include <lttng/core.h>
+#include "getcpu.h"
 
 /*
  * 4kB of per-cpu data available. Enough to hold the control structures,
@@ -28,45 +29,6 @@ int num_possible_cpus(void)
        return __num_possible_cpus;
 }
 
-/*
- * get_cpu() returns the current CPU number. It may change due to
- * migration, so it is only statistically accurate.
- */
-#ifndef UST_VALGRIND
-static inline
-int get_cpu(void)
-{
-       int cpu;
-
-       cpu = sched_getcpu();
-       if (caa_likely(cpu >= 0))
-               return cpu;
-       /*
-        * If getcpu(2) is not implemented in the Kernel use CPU 0 as fallback.
-        */
-       return 0;
-}
-
-#else  /* #else #ifndef UST_VALGRIND */
-static inline
-int get_cpu(void)
-{
-       /*
-        * Valgrind does not support the sched_getcpu() vsyscall.
-        * It causes it to detect a segfault in the program and stop it.
-        * So if we want to check libust with valgrind, we have to refrain
-        * from using this call. TODO: it would probably be better to return
-        * other values too, to better test it.
-        */
-       return 0;
-}
-#endif /* #else #ifndef UST_VALGRIND */
-
-static inline
-void put_cpu(void)
-{
-}
-
 #define for_each_possible_cpu(cpu)             \
        for ((cpu) = 0; (cpu) < num_possible_cpus(); (cpu)++)