projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: liblttng-ctl: unreported truncations when copying strings
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
notification-thread.c
diff --git
a/src/bin/lttng-sessiond/notification-thread.c
b/src/bin/lttng-sessiond/notification-thread.c
index 0c2d0d294628e2aea442498592ec1f379b15727a..1a7a16119972b3cebc45e7b3098e03a83fc81bef 100644
(file)
--- a/
src/bin/lttng-sessiond/notification-thread.c
+++ b/
src/bin/lttng-sessiond/notification-thread.c
@@
-134,6
+134,7
@@
struct notification_thread_handle *notification_thread_handle_create(
} else {
handle->channel_monitoring_pipes.kernel_consumer = -1;
}
} else {
handle->channel_monitoring_pipes.kernel_consumer = -1;
}
+
end:
return handle;
error:
end:
return handle;
error:
@@
-366,6
+367,10
@@
void fini_thread_state(struct notification_thread_state *state)
ret = cds_lfht_destroy(state->triggers_by_name_uid_ht, NULL);
assert(!ret);
}
ret = cds_lfht_destroy(state->triggers_by_name_uid_ht, NULL);
assert(!ret);
}
+ if (state->trigger_tokens_ht) {
+ ret = cds_lfht_destroy(state->trigger_tokens_ht, NULL);
+ assert(!ret);
+ }
/*
* Must be destroyed after all channels have been destroyed.
* See comment in struct lttng_session_trigger_list.
/*
* Must be destroyed after all channels have been destroyed.
* See comment in struct lttng_session_trigger_list.
@@
-378,6
+383,9
@@
void fini_thread_state(struct notification_thread_state *state)
notification_channel_socket_destroy(
state->notification_channel_socket);
}
notification_channel_socket_destroy(
state->notification_channel_socket);
}
+
+ assert(cds_list_empty(&state->tracer_event_sources_list));
+
if (state->executor) {
action_executor_destroy(state->executor);
}
if (state->executor) {
action_executor_destroy(state->executor);
}
@@
-407,6
+415,7
@@
int init_thread_state(struct notification_thread_handle *handle,
memset(state, 0, sizeof(*state));
state->notification_channel_socket = -1;
memset(state, 0, sizeof(*state));
state->notification_channel_socket = -1;
+ state->trigger_id.next_tracer_token = 1;
lttng_poll_init(&state->events);
ret = notification_channel_socket_create();
lttng_poll_init(&state->events);
ret = notification_channel_socket_create();
@@
-485,6
+494,14
@@
int init_thread_state(struct notification_thread_handle *handle,
goto error;
}
goto error;
}
+ state->trigger_tokens_ht = cds_lfht_new(DEFAULT_HT_SIZE,
+ 1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
+ if (!state->trigger_tokens_ht) {
+ goto error;
+ }
+
+ CDS_INIT_LIST_HEAD(&state->tracer_event_sources_list);
+
state->executor = action_executor_create(handle);
if (!state->executor) {
goto error;
state->executor = action_executor_create(handle);
if (!state->executor) {
goto error;
This page took
0.024538 seconds
and
4
git commands to generate.