X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-ust-comm.c;h=7e587499efd2b14ce484a54a232fde6e3a5f4401;hb=f27f1026353ae61083b7a2221f912b0299095a04;hp=cb9f8c88361cddf9fa308a31100351c1147e3b54;hpb=b62f8205216d20d7ef16b536efd81389dc6fdd2f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index cb9f8c88..7e587499 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -54,6 +54,7 @@
 #include "context-internal.h"
 #include "ust-compat.h"
 #include "lttng-counter-client.h"
+#include "lttng-rb-clients.h"
 
 /*
  * Has lttng ust comm constructor been called ?
@@ -351,17 +352,6 @@ static const char *cmd_name_mapping[] = {
 static const char *str_timeout;
 static int got_timeout_env;
 
-extern void lttng_ring_buffer_client_overwrite_init(void);
-extern void lttng_ring_buffer_client_overwrite_rt_init(void);
-extern void lttng_ring_buffer_client_discard_init(void);
-extern void lttng_ring_buffer_client_discard_rt_init(void);
-extern void lttng_ring_buffer_metadata_client_init(void);
-extern void lttng_ring_buffer_client_overwrite_exit(void);
-extern void lttng_ring_buffer_client_overwrite_rt_exit(void);
-extern void lttng_ring_buffer_client_discard_exit(void);
-extern void lttng_ring_buffer_client_discard_rt_exit(void);
-extern void lttng_ring_buffer_metadata_client_exit(void);
-
 static char *get_map_shm(struct sock_info *sock_info);
 
 ssize_t lttng_ust_read(int fd, void *buf, size_t len)
@@ -437,6 +427,31 @@ void lttng_ust_fixup_tls(void)
 	lttng_fixup_net_ns_tls();
 	lttng_fixup_time_ns_tls();
 	lttng_fixup_uts_ns_tls();
+	lttng_ust_fixup_ring_buffer_client_discard_tls();
+	lttng_ust_fixup_ring_buffer_client_discard_rt_tls();
+	lttng_ust_fixup_ring_buffer_client_overwrite_tls();
+	lttng_ust_fixup_ring_buffer_client_overwrite_rt_tls();
+}
+
+/*
+ * LTTng-UST uses Global Dynamic model TLS variables rather than IE
+ * model because many versions of glibc don't preallocate a pool large
+ * enough for TLS variables IE model defined in other shared libraries,
+ * and causes issues when using LTTng-UST for Java tracing.
+ *
+ * Because of this use of Global Dynamic TLS variables, users wishing to
+ * trace from signal handlers need to explicitly trigger the lazy
+ * allocation of those variables for each thread before using them.
+ * This can be triggered by calling lttng_ust_init_thread().
+ */
+void lttng_ust_init_thread(void)
+{
+	/*
+	 * Because those TLS variables are global dynamic, we need to
+	 * ensure those are initialized before a signal handler nesting over
+	 * this thread attempts to use them.
+	 */
+	lttng_ust_fixup_tls();
 }
 
 int lttng_get_notify_socket(void *owner)
@@ -2106,13 +2121,8 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	lttng_ust_clock_init();
 	lttng_ust_getcpu_init();
 	lttng_ust_statedump_init();
-	lttng_ring_buffer_metadata_client_init();
-	lttng_ring_buffer_client_overwrite_init();
-	lttng_ring_buffer_client_overwrite_rt_init();
-	lttng_ring_buffer_client_discard_init();
-	lttng_ring_buffer_client_discard_rt_init();
-	lttng_counter_client_percpu_32_modular_init();
-	lttng_counter_client_percpu_64_modular_init();
+	lttng_ust_ring_buffer_clients_init();
+	lttng_ust_counter_clients_init();
 	lttng_perf_counter_init();
 	/*
 	 * Invoke ust malloc wrapper init before starting other threads.
@@ -2253,13 +2263,8 @@ void lttng_ust_cleanup(int exiting)
 	lttng_ust_abi_exit();
 	lttng_ust_abi_events_exit();
 	lttng_perf_counter_exit();
-	lttng_ring_buffer_client_discard_rt_exit();
-	lttng_ring_buffer_client_discard_exit();
-	lttng_ring_buffer_client_overwrite_rt_exit();
-	lttng_ring_buffer_client_overwrite_exit();
-	lttng_ring_buffer_metadata_client_exit();
-	lttng_counter_client_percpu_32_modular_exit();
-	lttng_counter_client_percpu_64_modular_exit();
+	lttng_ust_ring_buffer_clients_exit();
+	lttng_ust_counter_clients_exit();
 	lttng_ust_statedump_destroy();
 	lttng_ust_tp_exit();
 	if (!exiting) {