X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust%2Flttng-events.c;h=03acff110466405976fccdb509d85077377f532b;hb=128cf0ddb55234bca094ba4523fa3b5cb653fba3;hp=6e16cf2548f04087ec3d1b6805736d3da1f179b5;hpb=37dddb65504eff070a64fb4a8f1c56ee81c3173c;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 6e16cf25..03acff11 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -60,21 +60,9 @@
 #include "jhash.h"
 
 /*
- * The sessions mutex is the centralized mutex across UST tracing
- * control and probe registration. All operations within this file are
- * called by the communication thread, under ust_lock protection.
+ * All operations within this file are called by the communication
+ * thread, under ust_lock protection.
  */
-static pthread_mutex_t sessions_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-void ust_lock(void)
-{
-	pthread_mutex_lock(&sessions_mutex);
-}
-
-void ust_unlock(void)
-{
-	pthread_mutex_unlock(&sessions_mutex);
-}
 
 static CDS_LIST_HEAD(sessions);
 
@@ -112,8 +100,6 @@ int lttng_loglevel_match(int loglevel,
 		enum lttng_ust_loglevel_type req_type,
 		int req_loglevel)
 {
-	if (req_type == LTTNG_UST_LOGLEVEL_ALL)
-		return 1;
 	if (!has_loglevel)
 		loglevel = TRACE_DEFAULT;
 	switch (req_type) {
@@ -686,7 +672,7 @@ int lttng_fix_pending_events(void)
  * Only dump state for the sessions owned by the caller thread, because
  * we don't keep ust_lock across the entire iteration.
  */
-int lttng_handle_pending_statedump(void *owner)
+void lttng_handle_pending_statedump(void *owner)
 {
 	struct lttng_session *session;
 
@@ -694,7 +680,9 @@ int lttng_handle_pending_statedump(void *owner)
 	lttng_ust_baddr_statedump(owner);
 
 	/* Clear pending state dump */
-	ust_lock();
+	if (ust_lock()) {
+		goto end;
+	}
 	cds_list_for_each_entry(session, &sessions, node) {
 		if (session->owner != owner)
 			continue;
@@ -702,8 +690,9 @@ int lttng_handle_pending_statedump(void *owner)
 			continue;
 		session->statedump_pending = 0;
 	}
+end:
 	ust_unlock();
-	return 0;
+	return;
 }
 
 /*