Rename all 'fixup_tls' functions to 'alloc_tls'

[lttng-ust.git] / src / lib / lttng-ust-common / fd-tracker.c

diff --git a/src/lib/lttng-ust-common/fd-tracker.c b/src/lib/lttng-ust-common/fd-tracker.c
index 026a9327f297ac016ca009763716eb308e752e37..7a17e2a0ab32bb00a851088ad896e746244b1ac9 100644 (file)
--- a/src/lib/lttng-ust-common/fd-tracker.c
+++ b/src/lib/lttng-ust-common/fd-tracker.c
@@ -30,6 +30,8 @@
 #include <lttng/ust-error.h>
 #include "common/logging.h"
 
+#include "lib/lttng-ust-common/fd-tracker.h"
+
 /* Operations on the fd set. */
 #define IS_FD_VALID(fd)                        ((fd) >= 0 && (fd) < lttng_ust_max_fd)
 #define GET_FD_SET_FOR_FD(fd, fd_sets) (&((fd_sets)[(fd) / FD_SETSIZE]))
@@ -46,7 +48,7 @@
 
 /*
  * Protect the lttng_fd_set. Nests within the ust_lock, and therefore
- * within the libc dl lock. Therefore, we need to fixup the TLS before
+ * within the libc dl lock. Therefore, we need to allocate the TLS before
  * nesting into this lock.
  *
  * The ust_safe_guard_fd_mutex nests within the ust_mutex. This mutex
@@ -75,9 +77,9 @@ static int num_fd_sets;
 static int init_done;
 
 /*
- * Force a read (imply TLS fixup for dlopen) of TLS variables.
+ * Force a read (imply TLS allocation for dlopen) of TLS variables.
  */
-void lttng_ust_fixup_fd_tracker_tls(void)
+void lttng_ust_fd_tracker_alloc_tls(void)
 {
        asm volatile ("" : : "m" (URCU_TLS(ust_fd_mutex_nest)));
 }
@@ -87,7 +89,7 @@ void lttng_ust_fixup_fd_tracker_tls(void)
  * process. This will be called during the constructor execution
  * and will also be called in the child after fork via lttng_ust_init.
  */
-void lttng_ust_init_fd_tracker(void)
+void lttng_ust_fd_tracker_init(void)
 {
        struct rlimit rlim;
        int i;
@@ -269,7 +271,7 @@ int lttng_ust_add_fd_to_tracker(int fd)
         * Ensure the tracker is initialized when called from
         * constructors.
         */
-       lttng_ust_init_fd_tracker();
+       lttng_ust_fd_tracker_init();
        assert(URCU_TLS(ust_fd_mutex_nest));
 
        if (IS_FD_STD(fd)) {
@@ -301,7 +303,7 @@ void lttng_ust_delete_fd_from_tracker(int fd)
         * Ensure the tracker is initialized when called from
         * constructors.
         */
-       lttng_ust_init_fd_tracker();
+       lttng_ust_fd_tracker_init();
 
        assert(URCU_TLS(ust_fd_mutex_nest));
        /* Not a valid fd. */
@@ -321,13 +323,13 @@ int lttng_ust_safe_close_fd(int fd, int (*close_cb)(int fd))
 {
        int ret = 0;
 
-       lttng_ust_fixup_fd_tracker_tls();
+       lttng_ust_fd_tracker_alloc_tls();
 
        /*
         * Ensure the tracker is initialized when called from
         * constructors.
         */
-       lttng_ust_init_fd_tracker();
+       lttng_ust_fd_tracker_init();
 
        /*
         * If called from lttng-ust, we directly call close without
@@ -357,13 +359,13 @@ int lttng_ust_safe_fclose_stream(FILE *stream, int (*fclose_cb)(FILE *stream))
 {
        int ret = 0, fd;
 
-       lttng_ust_fixup_fd_tracker_tls();
+       lttng_ust_fd_tracker_alloc_tls();
 
        /*
         * Ensure the tracker is initialized when called from
         * constructors.
         */
-       lttng_ust_init_fd_tracker();
+       lttng_ust_fd_tracker_init();
 
        /*
         * If called from lttng-ust, we directly call fclose without
@@ -412,13 +414,13 @@ int lttng_ust_safe_closefrom_fd(int lowfd, int (*close_cb)(int fd))
 {
        int ret = 0, close_success = 0, i;
 
-       lttng_ust_fixup_fd_tracker_tls();
+       lttng_ust_fd_tracker_alloc_tls();
 
        /*
         * Ensure the tracker is initialized when called from
         * constructors.
         */
-       lttng_ust_init_fd_tracker();
+       lttng_ust_fd_tracker_init();
 
        if (lowfd < 0) {
                /*