projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix ua_chan assert
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-app.c
diff --git
a/src/bin/lttng-sessiond/ust-app.c
b/src/bin/lttng-sessiond/ust-app.c
index 396ca936e004d751633fb6a8fce41cfd9c0b61cd..ee3b3406da781b1d488d17af5218933d2eefd265 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-app.c
+++ b/
src/bin/lttng-sessiond/ust-app.c
@@
-4475,9
+4475,14
@@
static int reply_ust_register_channel(int sock, int sobjd, int cobjd,
goto error_rcu_unlock;
}
goto error_rcu_unlock;
}
- /* Lookup channel by UST object descriptor.
Should always be found.
*/
+ /* Lookup channel by UST object descriptor. */
ua_chan = find_channel_by_objd(app, cobjd);
ua_chan = find_channel_by_objd(app, cobjd);
- assert(ua_chan);
+ if (!ua_chan) {
+ DBG("Application channel is being teardown. Abort event notify");
+ ret = 0;
+ goto error_rcu_unlock;
+ }
+
assert(ua_chan->session);
ua_sess = ua_chan->session;
assert(ua_chan->session);
ua_sess = ua_chan->session;
@@
-4581,9
+4586,14
@@
static int add_event_ust_registry(int sock, int sobjd, int cobjd, char *name,
goto error_rcu_unlock;
}
goto error_rcu_unlock;
}
- /* Lookup channel by UST object descriptor.
Should always be found.
*/
+ /* Lookup channel by UST object descriptor. */
ua_chan = find_channel_by_objd(app, cobjd);
ua_chan = find_channel_by_objd(app, cobjd);
- assert(ua_chan);
+ if (!ua_chan) {
+ DBG("Application channel is being teardown. Abort event notify");
+ ret = 0;
+ goto error_rcu_unlock;
+ }
+
assert(ua_chan->session);
ua_sess = ua_chan->session;
assert(ua_chan->session);
ua_sess = ua_chan->session;
This page took
0.02381 seconds
and
4
git commands to generate.