X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Ftracepoint.c;h=db5886009de5f620f24880e884b1345618470a2d;hb=8478887d1c753e281a584c0e8a3b63f34359ff76;hp=a4a79ba59b3f8298b30a2889bf6e7e30ef04aad2;hpb=1a20609484df56e378318d65f07f39dcd8ec1db2;p=lttng-ust.git

diff --git a/liblttng-ust/tracepoint.c b/liblttng-ust/tracepoint.c
index a4a79ba5..db588600 100644
--- a/liblttng-ust/tracepoint.c
+++ b/liblttng-ust/tracepoint.c
@@ -30,6 +30,7 @@
 #include <urcu/hlist.h>
 #include <urcu/uatomic.h>
 #include <urcu/compiler.h>
+#include <urcu/system.h>
 
 #include <lttng/tracepoint.h>
 #include <lttng/ust-abi.h>	/* for LTTNG_UST_SYM_NAME_LEN */
@@ -42,6 +43,13 @@
 #include "jhash.h"
 #include "error.h"
 
+/* Test compiler support for weak symbols with hidden visibility. */
+int __tracepoint_test_symbol1 __attribute__((weak, visibility("hidden")));
+void *__tracepoint_test_symbol2 __attribute__((weak, visibility("hidden")));
+struct {
+	char a[24];
+} __tracepoint_test_symbol3 __attribute__((weak, visibility("hidden")));
+
 /* Set to 1 to enable tracepoint debug output */
 static const int tracepoint_debug;
 static int initialized;
@@ -347,7 +355,7 @@ static void set_tracepoint(struct tracepoint_entry **entry,
 	 * is used.
 	 */
 	rcu_assign_pointer(elem->probes, (*entry)->probes);
-	elem->state = active;
+	CMM_STORE_SHARED(elem->state, active);
 }
 
 /*
@@ -358,7 +366,7 @@ static void set_tracepoint(struct tracepoint_entry **entry,
  */
 static void disable_tracepoint(struct lttng_ust_tracepoint *elem)
 {
-	elem->state = 0;
+	CMM_STORE_SHARED(elem->state, 0);
 	rcu_assign_pointer(elem->probes, NULL);
 }
 
@@ -802,11 +810,34 @@ int tracepoint_unregister_lib(struct lttng_ust_tracepoint * const *tracepoints_s
 	return 0;
 }
 
+/*
+ * Report in debug message whether the compiler correctly supports weak
+ * hidden symbols. This test checks that the address associated with two
+ * weak symbols with hidden visibility is the same when declared within
+ * two compile units part of the same module.
+ */
+static void check_weak_hidden(void)
+{
+	DBG("Your compiler treats weak symbols with hidden visibility for integer objects as %s between compile units part of the same module.",
+		&__tracepoint_test_symbol1 == lttng_ust_tp_check_weak_hidden1() ?
+			"SAME address" :
+			"DIFFERENT addresses");
+	DBG("Your compiler treats weak symbols with hidden visibility for pointer objects as %s between compile units part of the same module.",
+		&__tracepoint_test_symbol2 == lttng_ust_tp_check_weak_hidden2() ?
+			"SAME address" :
+			"DIFFERENT addresses");
+	DBG("Your compiler treats weak symbols with hidden visibility for 24-byte structure objects as %s between compile units part of the same module.",
+		&__tracepoint_test_symbol3 == lttng_ust_tp_check_weak_hidden3() ?
+			"SAME address" :
+			"DIFFERENT addresses");
+}
+
 void init_tracepoint(void)
 {
 	if (uatomic_xchg(&initialized, 1) == 1)
 		return;
 	init_usterr();
+	check_weak_hidden();
 }
 
 void exit_tracepoint(void)