Expose a common alloc_tls for liblttng-ust-common

Expose a common function to force the allocation of all TLS variables
owned by liblttng-ust-common, hide the fd-tracker behind it.

Change-Id: I6acfe7f85bce1e8939cd8e1d64ecb979525fa547
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ust-common.h b/include/lttng/ust-common.h
index 8396e6b44151b836c136920edd159d1c3a7b560e..a59a02359e7a89bd36375d044967eab594b05918 100644 (file)
--- a/include/lttng/ust-common.h
+++ b/include/lttng/ust-common.h
@@ -17,4 +17,6 @@
 void lttng_ust_common_ctor(void)
        __attribute__((constructor));
 
+void lttng_ust_common_alloc_tls(void);
+
 #endif

diff --git a/src/common/ust-fd.h b/src/common/ust-fd.h
index b6a078bf836b52b52ddf1dfb13c9a4f81fcb7778..4e6c4a5d2bd6e729bf1209d49f29a05a79ba99f5 100644 (file)
--- a/src/common/ust-fd.h
+++ b/src/common/ust-fd.h
@@ -26,6 +26,4 @@ int lttng_ust_safe_close_fd(int fd, int (*close_cb)(int));
 int lttng_ust_safe_fclose_stream(FILE *stream, int (*fclose_cb)(FILE *stream));
 int lttng_ust_safe_closefrom_fd(int lowfd, int (*close_cb)(int));
 
-void lttng_ust_fd_tracker_alloc_tls(void);
-
 #endif /* _LTTNG_UST_FD_H */

diff --git a/src/lib/lttng-ust-common/fd-tracker.h b/src/lib/lttng-ust-common/fd-tracker.h
index 07c13724d08741ba2f77dfe18cb38a4b1814352f..2432eaa47bdbe353afc38084872c72bab1208fc5 100644 (file)
--- a/src/lib/lttng-ust-common/fd-tracker.h
+++ b/src/lib/lttng-ust-common/fd-tracker.h
@@ -10,4 +10,7 @@
 void lttng_ust_fd_tracker_init(void)
        __attribute__((visibility("hidden")));
 
+void lttng_ust_fd_tracker_alloc_tls(void)
+       __attribute__((visibility("hidden")));
+
 #endif

diff --git a/src/lib/lttng-ust-common/ust-common.c b/src/lib/lttng-ust-common/ust-common.c
index e163383d2b458bca3b9386f91b680cb0da825ea9..f444c97f1a7cb7916b5237de791dcf606a774423 100644 (file)
--- a/src/lib/lttng-ust-common/ust-common.c
+++ b/src/lib/lttng-ust-common/ust-common.c
@@ -25,3 +25,8 @@ void lttng_ust_common_ctor(void)
         */
        lttng_ust_fd_tracker_init();
 }
+
+void lttng_ust_common_alloc_tls(void)
+{
+       lttng_ust_fd_tracker_alloc_tls();
+}

diff --git a/src/lib/lttng-ust/lttng-ust-comm.c b/src/lib/lttng-ust/lttng-ust-comm.c
index b76564723ddca64ca404e256013abc84fe5404ac..6cdce82dbd22550bba602eae6f3ef000fef59219 100644 (file)
--- a/src/lib/lttng-ust/lttng-ust-comm.c
+++ b/src/lib/lttng-ust/lttng-ust-comm.c
@@ -406,7 +406,7 @@ void lttng_ust_alloc_tls(void)
        lttng_procname_alloc_tls();
        lttng_ust_mutex_nest_alloc_tls();
        lttng_ust_perf_counter_alloc_tls();
-       lttng_ust_fd_tracker_alloc_tls();
+       lttng_ust_common_alloc_tls();
        lttng_cgroup_ns_alloc_tls();
        lttng_ipc_ns_alloc_tls();
        lttng_net_ns_alloc_tls();