X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=a84316a9358caeda6be0138a439c3828dd979b8e;hb=8002ea62058fd7e44575f7056a26c6b257948d03;hp=cc9b6b5e1e8706a1b941de1b0d09ea37dddaffd3;hpb=2315088b93f925c5cccee865ccb8f6bc542e52dc;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index cc9b6b5e..a84316a9 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -106,6 +106,14 @@ static pthread_mutex_t ust_fork_mutex = PTHREAD_MUTEX_INITIALIZER;
 /* Should the ust comm thread quit ? */
 static int lttng_ust_comm_should_quit;
 
+/*
+ * This variable can be tested by applications to check whether
+ * lttng-ust is loaded. They simply have to define their own
+ * "lttng_ust_loaded" weak symbol, and test it. It is set to 1 by the
+ * library constructor.
+ */
+int lttng_ust_loaded __attribute__((weak));
+
 /*
  * Return 0 on success, -1 if should quit.
  * The lock is taken in both cases.
@@ -1547,13 +1555,6 @@ void lttng_ust_malloc_wrapper_init(void)
 {
 }
 
-static
-void init_ust_env(void)
-{
-	if (putenv("LTTNG_UST_LOADED=1"))
-		DBG("Error setting LTTNG_UST_LOADED environment variable");
-}
-
 /*
  * sessiond monitoring thread: monitor presence of global and per-user
  * sessiond by polling the application common named pipe.
@@ -1581,7 +1582,7 @@ void __attribute__((constructor)) lttng_ust_init(void)
 	lttng_fixup_procname_tls();
 	lttng_fixup_ust_mutex_nest_tls();
 
-	init_ust_env();
+	lttng_ust_loaded = 1;
 
 	/*
 	 * We want precise control over the order in which we construct
@@ -1714,6 +1715,7 @@ void lttng_ust_cleanup(int exiting)
 {
 	cleanup_sock_info(&global_apps, exiting);
 	cleanup_sock_info(&local_apps, exiting);
+	local_apps.allowed = 0;
 	/*
 	 * The teardown in this function all affect data structures
 	 * accessed under the UST lock by the listener thread. This
@@ -1863,11 +1865,11 @@ void ust_after_fork_child(sigset_t *restore_sigset)
 {
 	if (URCU_TLS(lttng_ust_nest_count))
 		return;
+	lttng_context_vtid_reset();
 	DBG("process %d", getpid());
 	/* Release urcu mutexes */
 	rcu_bp_after_fork_child();
 	lttng_ust_cleanup(0);
-	lttng_context_vtid_reset();
 	/* Release mutexes and reenable signals */
 	ust_after_fork_common(restore_sigset);
 	lttng_ust_init();