X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-comm.c;h=e449edad0ad1916cb09ca3bcc070f49e6574d22d;hb=5d8027905c6bfca7a656474113611a298c020c4a;hp=f91f8fd9a86685be3337657beed7af3aff393ccb;hpb=01be959de2f1879fcd54a47a74ff443e2ef12f90;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-comm.c b/liblttng-ust/lttng-ust-comm.c
index f91f8fd9..e449edad 100644
--- a/liblttng-ust/lttng-ust-comm.c
+++ b/liblttng-ust/lttng-ust-comm.c
@@ -423,6 +423,7 @@ void lttng_ust_fixup_tls(void)
 	lttng_fixup_nest_count_tls();
 	lttng_fixup_procname_tls();
 	lttng_fixup_ust_mutex_nest_tls();
+	lttng_ust_fixup_perf_counter_tls();
 	lttng_ust_fixup_fd_tracker_tls();
 }
 
@@ -1457,7 +1458,6 @@ void *ust_listener_thread(void *arg)
 	long timeout;
 
 	lttng_ust_fixup_tls();
-	lttng_ust_fd_tracker_register_thread();
 	/*
 	 * If available, add '-ust' to the end of this thread's
 	 * process name
@@ -2069,6 +2069,7 @@ void ust_before_fork(sigset_t *save_sigset)
 	ust_lock_nocheck();
 	rcu_bp_before_fork();
 	lttng_ust_lock_fd_tracker();
+	lttng_perf_lock();
 }
 
 static void ust_after_fork_common(sigset_t *restore_sigset)
@@ -2076,6 +2077,7 @@ static void ust_after_fork_common(sigset_t *restore_sigset)
 	int ret;
 
 	DBG("process %d", getpid());
+	lttng_perf_unlock();
 	lttng_ust_unlock_fd_tracker();
 	ust_unlock();