projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: don't put() thread on shutdown failure
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
notification-thread-events.c
diff --git
a/src/bin/lttng-sessiond/notification-thread-events.c
b/src/bin/lttng-sessiond/notification-thread-events.c
index ba4e5a057eb79464835a0ae159fbc0d1f2cf3091..9d82b8313bfc59701619378a22cb69550bfc5eb4 100644
(file)
--- a/
src/bin/lttng-sessiond/notification-thread-events.c
+++ b/
src/bin/lttng-sessiond/notification-thread-events.c
@@
-1518,6
+1518,7
@@
struct session_info *find_or_create_session_info(
if (!session) {
ERR("[notification-thread] Failed to allocation session info for session \"%s\" (uid = %i, gid = %i)",
name, uid, gid);
if (!session) {
ERR("[notification-thread] Failed to allocation session info for session \"%s\" (uid = %i, gid = %i)",
name, uid, gid);
+ lttng_session_trigger_list_destroy(trigger_list);
goto error;
}
trigger_list = NULL;
goto error;
}
trigger_list = NULL;
@@
-1930,6
+1931,7
@@
int bind_trigger_to_matching_channels(const struct lttng_trigger *trigger,
channels_ht_node) {
struct lttng_trigger_list_element *trigger_list_element;
struct lttng_channel_trigger_list *trigger_list;
channels_ht_node) {
struct lttng_trigger_list_element *trigger_list_element;
struct lttng_channel_trigger_list *trigger_list;
+ struct cds_lfht_iter lookup_iter;
if (!trigger_applies_to_channel(trigger, channel)) {
continue;
if (!trigger_applies_to_channel(trigger, channel)) {
continue;
@@
-1939,8
+1941,8
@@
int bind_trigger_to_matching_channels(const struct lttng_trigger *trigger,
hash_channel_key(&channel->key),
match_channel_trigger_list,
&channel->key,
hash_channel_key(&channel->key),
match_channel_trigger_list,
&channel->key,
- &iter);
- node = cds_lfht_iter_get_node(&iter);
+ &
lookup_
iter);
+ node = cds_lfht_iter_get_node(&
lookup_
iter);
assert(node);
trigger_list = caa_container_of(node,
struct lttng_channel_trigger_list,
assert(node);
trigger_list = caa_container_of(node,
struct lttng_channel_trigger_list,
@@
-2276,9
+2278,9
@@
int handle_notification_thread_command(
struct notification_thread_command *cmd;
/* Read the event pipe to put it back into a quiescent state. */
struct notification_thread_command *cmd;
/* Read the event pipe to put it back into a quiescent state. */
- ret = read(lttng_pipe_get_readfd(handle->cmd_queue.event_pipe), &counter,
+ ret =
lttng_
read(lttng_pipe_get_readfd(handle->cmd_queue.event_pipe), &counter,
sizeof(counter));
sizeof(counter));
- if (ret
== -1
) {
+ if (ret
!= sizeof(counter)
) {
goto error;
}
goto error;
}
This page took
0.024945 seconds
and
4
git commands to generate.