X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-fd-tracker.c;h=c9b5fdc0250c72d3538fe6fc9d35b77c45ce3d31;hb=5f6daaef86c3b4cff5af523cbbd8f2630634259d;hp=42c3984cc2d3a390f941005f82a0315aa329c208;hpb=48a143c09cc97bf7a2ace811277e7d60b294b5f6;p=lttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-fd-tracker.c b/liblttng-ust-comm/lttng-ust-fd-tracker.c
index 42c3984c..c9b5fdc0 100644
--- a/liblttng-ust-comm/lttng-ust-fd-tracker.c
+++ b/liblttng-ust-comm/lttng-ust-fd-tracker.c
@@ -1,23 +1,10 @@
 /*
- * Copyright (C)  2016 - Aravind HT <aravind.ht@gmail.com>
- *                2016 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * Copyright (C) 2016 Aravind HT <aravind.ht@gmail.com>
+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -39,7 +26,7 @@
 #include <urcu/system.h>
 
 #include <ust-fd.h>
-#include <helper.h>
+#include <ust-helper.h>
 #include <lttng/ust-error.h>
 #include <usterr-signal-safe.h>
 
@@ -77,20 +64,12 @@ static int ust_safe_guard_saved_cancelstate;
 
 /*
  * Track whether we are within lttng-ust or application, for close
- * system call override by LD_PRELOAD library. Threads registered
- * as being lttng-ust listener threads need to perform fd tracker
- * locking explicitly around their use of file descriptor manipulation
- * functions.
- */
-static DEFINE_URCU_TLS(int, thread_fd_tracking);
-
-/*
- * Track whether we are invoking close() from a signal handler nested on
- * an application thread.
+ * system call override by LD_PRELOAD library. This also tracks whether
+ * we are invoking close() from a signal handler nested on an
+ * application thread.
  */
 static DEFINE_URCU_TLS(int, ust_fd_mutex_nest);
 
-
 /* fd_set used to book keep fd being used by lttng-ust. */
 static fd_set *lttng_fd_set;
 static int lttng_ust_max_fd;
@@ -102,7 +81,6 @@ static int init_done;
  */
 void lttng_ust_fixup_fd_tracker_tls(void)
 {
-	asm volatile ("" : : "m" (URCU_TLS(thread_fd_tracking)));
 	asm volatile ("" : : "m" (URCU_TLS(ust_fd_mutex_nest)));
 }
 
@@ -357,7 +335,7 @@ int lttng_ust_safe_close_fd(int fd, int (*close_cb)(int fd))
 	 * If called from lttng-ust, we directly call close without
 	 * validating whether the FD is part of the tracked set.
 	 */
-	if (URCU_TLS(thread_fd_tracking))
+	if (URCU_TLS(ust_fd_mutex_nest))
 		return close_cb(fd);
 
 	lttng_ust_lock_fd_tracker();
@@ -393,7 +371,7 @@ int lttng_ust_safe_fclose_stream(FILE *stream, int (*fclose_cb)(FILE *stream))
 	 * If called from lttng-ust, we directly call fclose without
 	 * validating whether the FD is part of the tracked set.
 	 */
-	if (URCU_TLS(thread_fd_tracking))
+	if (URCU_TLS(ust_fd_mutex_nest))
 		return fclose_cb(stream);
 
 	fd = fileno(stream);
@@ -456,7 +434,7 @@ int lttng_ust_safe_closefrom_fd(int lowfd, int (*close_cb)(int fd))
 	 * If called from lttng-ust, we directly call close without
 	 * validating whether the FD is part of the tracked set.
 	 */
-	if (URCU_TLS(thread_fd_tracking)) {
+	if (URCU_TLS(ust_fd_mutex_nest)) {
 		for (i = lowfd; i < lttng_ust_max_fd; i++) {
 			if (close_cb(i) < 0) {
 				switch (errno) {
@@ -501,8 +479,3 @@ int lttng_ust_safe_closefrom_fd(int lowfd, int (*close_cb)(int fd))
 end:
 	return ret;
 }
-
-void lttng_ust_fd_tracker_register_thread(void)
-{
-	URCU_TLS(thread_fd_tracking) = 1;
-}