X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.cpp;h=2fc3b6f4f120793dd280e78d8d170113ca04e9d7;hb=3130a40c184a9315f0a4ca9a235273277fdcabde;hp=fcc4267ad5ea8360ae6e139bada338f6f1dff83e;hpb=53cd1e2272afac08649dc55e395ec8a5dac20b4e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.cpp b/src/bin/lttng-sessiond/ust-app.cpp
index fcc4267ad..2fc3b6f4f 100644
--- a/src/bin/lttng-sessiond/ust-app.cpp
+++ b/src/bin/lttng-sessiond/ust-app.cpp
@@ -3411,8 +3411,8 @@ static int create_channel_per_uid(struct ust_app *app,
 
 	session = session_find_by_id(ua_sess->tracing_id);
 	LTTNG_ASSERT(session);
-	LTTNG_ASSERT(pthread_mutex_trylock(&session->lock));
-	LTTNG_ASSERT(session_trylock_list());
+	ASSERT_LOCKED(session->lock);
+	ASSERT_SESSION_LIST_LOCKED();
 
 	/*
 	 * Create the buffers on the consumer side. This call populates the
@@ -3527,9 +3527,8 @@ static int create_channel_per_pid(struct ust_app *app,
 
 	session = session_find_by_id(ua_sess->tracing_id);
 	LTTNG_ASSERT(session);
-
-	LTTNG_ASSERT(pthread_mutex_trylock(&session->lock));
-	LTTNG_ASSERT(session_trylock_list());
+	ASSERT_LOCKED(session->lock);
+	ASSERT_SESSION_LIST_LOCKED();
 
 	/* Create and get channel on the consumer side. */
 	ret = do_consumer_create_channel(usess, ua_sess, ua_chan,
@@ -3874,9 +3873,8 @@ static int create_ust_app_metadata(struct ust_app_session *ua_sess,
 
 	session = session_find_by_id(ua_sess->tracing_id);
 	LTTNG_ASSERT(session);
-
-	LTTNG_ASSERT(pthread_mutex_trylock(&session->lock));
-	LTTNG_ASSERT(session_trylock_list());
+	ASSERT_LOCKED(session->lock);
+	ASSERT_SESSION_LIST_LOCKED();
 
 	/*
 	 * Ask the metadata channel creation to the consumer. The metadata object