#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]))
/*
* 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
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)));
}
* 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;
* 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)) {
/* Trying to add an fd which we can not accommodate. */
assert(IS_FD_VALID(fd));
- /* Setting an fd thats already set. */
+ /* Setting an fd that's already set. */
assert(!IS_FD_SET(fd, lttng_fd_set));
ADD_FD_TO_SET(fd, lttng_fd_set);
* 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. */
{
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
{
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
{
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) {
/*