X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fcore.h;h=0c483e8847e4fe0be3cd4e6c3b69997586d32a0c;hb=2b2d6ff75efc17aa74ea9b0a7f8c756d812804bb;hp=5bd19829e36160b66898dccd4ba2fcdddf7a6047;hpb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;p=lttng-ust.git

diff --git a/include/lttng/core.h b/include/lttng/core.h
index 5bd19829..0c483e88 100644
--- a/include/lttng/core.h
+++ b/include/lttng/core.h
@@ -74,13 +74,6 @@ static inline long IS_ERR(const void *ptr)
 	__max1 > __max2 ? __max1: __max2; })
 
 
-/* MUTEXES */
-
-#include <pthread.h>
-
-#define DEFINE_MUTEX(m) pthread_mutex_t (m) = PTHREAD_MUTEX_INITIALIZER;
-#define DECLARE_MUTEX(m) extern pthread_mutex_t (m);
-
 /* MALLOCATION */
 
 #include <stdlib.h>
@@ -105,7 +98,6 @@ void *zmalloc_align(size_t len)
 
 /* MATH */
 
-#include <lttng/processor.h>
 static inline unsigned int hweight32(unsigned int w)
 {
 	unsigned int res = w - ((w >> 1) & 0x55555555);
@@ -115,20 +107,6 @@ static inline unsigned int hweight32(unsigned int w)
 	return (res + (res >> 16)) & 0x000000FF;
 }
 
-static __inline__ int get_count_order(unsigned int count)
-{
-	int order;
-	
-	order = fls(count) - 1;
-	if (count & (count - 1))
-		order++;
-	return order;
-}
-
-#define _ust_container_of(ptr, type, member) ({                      \
-        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
-        (type *)( (char *)__mptr - offsetof(type,member) );})
-
 #ifndef inline_memcpy
 #define inline_memcpy memcpy
 #endif
@@ -137,35 +115,4 @@ static __inline__ int get_count_order(unsigned int count)
 #define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
 #endif
 
-#ifndef UST_VALGRIND
-
-static __inline__ int ust_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 ust_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 */
-
 #endif /* UST_CORE_H */