projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: Replace uses of session_trylock_list by a dedicated assert macro
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.cpp
diff --git
a/src/bin/lttng-sessiond/ust-app.cpp
b/src/bin/lttng-sessiond/ust-app.cpp
index fcc4267ad5ea8360ae6e139bada338f6f1dff83e..2fc3b6f4f120793dd280e78d8d170113ca04e9d7 100644
(file)
--- 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);
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
/*
* 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);
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,
/* 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);
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
/*
* Ask the metadata channel creation to the consumer. The metadata object
This page took
0.02435 seconds
and
4
git commands to generate.