X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Flttng-ust-common%2Ffd-tracker.c;h=7a17e2a0ab32bb00a851088ad896e746244b1ac9;hb=a9fd951a21f28704ffdfd4217766f725a217208b;hp=54f7deb4c027bd89fe14ea51e2a2d5d269252596;hpb=95fa2ba4fbbfac95bca6f437b2bb4389789b21eb;p=lttng-ust.git diff --git a/src/lib/lttng-ust-common/fd-tracker.c b/src/lib/lttng-ust-common/fd-tracker.c index 54f7deb4..7a17e2a0 100644 --- a/src/lib/lttng-ust-common/fd-tracker.c +++ b/src/lib/lttng-ust-common/fd-tracker.c @@ -48,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 @@ -77,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))); } @@ -323,7 +323,7 @@ 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 @@ -359,7 +359,7 @@ 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 @@ -414,7 +414,7 @@ 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