X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fcompat.h;fp=liblttng-ust%2Fcompat.h;h=7f0f5027ba6c9a619912fdef33cd866954b19f96;hb=653f7d34ca27a2e167d270519c2437c2ca537d2f;hp=200d9771f85462b91ceabb7b5404254787e25fb9;hpb=3415bfe5235453f16b9b286754ec1edd200bd290;p=lttng-ust.git

diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h
index 200d9771..7f0f5027 100644
--- a/liblttng-ust/compat.h
+++ b/liblttng-ust/compat.h
@@ -13,6 +13,10 @@
 #include <errno.h>
 #include <string.h>
 
+#ifdef __FreeBSD__
+#include <pthread_np.h>
+#endif
+
 #include <lttng/ust-abi.h>
 
 #define LTTNG_UST_PROCNAME_SUFFIX "-ust"
@@ -32,27 +36,14 @@ int lttng_pthread_setname_np(const char *name)
 
 	return pthread_setname_np(pthread_self(), name);
 }
-
-static inline
-int lttng_pthread_getname_np(char *name, size_t len)
-{
-	return pthread_getname_np(pthread_self(), name, len);
-}
 #elif defined(HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID)
 static inline
 int lttng_pthread_setname_np(const char *name)
 {
 	return pthread_setname_np(name);
 }
-
-static inline
-int lttng_pthread_getname_np(char *name, size_t len)
-{
-	return pthread_getname_np(name, len);
-}
 #elif defined(HAVE_PTHREAD_SET_NAME_NP_WITH_TID)
 
-#include <pthread_np.h>
 static inline
 int lttng_pthread_setname_np(const char *name)
 {
@@ -64,13 +55,6 @@ int lttng_pthread_setname_np(const char *name)
 	pthread_set_name_np(pthread_self(), name);
 	return 0;
 }
-
-static inline
-int lttng_pthread_getname_np(char *name, size_t len)
-{
-	pthread_get_name_np(pthread_self(), name, len);
-	return 0;
-}
 #elif defined(__linux__)
 
 /* Fallback on prtctl on Linux */
@@ -85,6 +69,35 @@ int lttng_pthread_setname_np(const char *name)
 	}
 	return prctl(PR_SET_NAME, name, 0, 0, 0);
 }
+#else
+#error "Please add pthread set name support for your OS."
+#endif
+
+
+#if defined(HAVE_PTHREAD_GETNAME_NP_WITH_TID)
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+	return pthread_getname_np(pthread_self(), name, len);
+}
+#elif defined(HAVE_PTHREAD_GETNAME_NP_WITHOUT_TID)
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+	return pthread_getname_np(name, len);
+}
+#elif defined(HAVE_PTHREAD_GET_NAME_NP_WITH_TID)
+
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+	pthread_get_name_np(pthread_self(), name, len);
+	return 0;
+}
+#elif defined(__linux__)
+
+/* Fallback on prtctl on Linux */
+#include <sys/prctl.h>
 
 static inline
 int lttng_pthread_getname_np(char *name, size_t len)
@@ -93,7 +106,7 @@ int lttng_pthread_getname_np(char *name, size_t len)
 }
 
 #else
-#error "Please add pthread name support for your OS."
+#error "Please add pthread get name support for your OS."
 #endif
 
 /*