projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only perform notification related unregistering when action is notify
[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 3ae8741d65b10a346bec2c965c1581873c8ea155..9b2cd5b96a9139ad9cea7e934b4e84770167d40c 100644
(file)
--- a/
src/bin/lttng-sessiond/notification-thread.c
+++ b/
src/bin/lttng-sessiond/notification-thread.c
@@
-17,7
+17,6
@@
#include <common/utils.h>
#include <common/align.h>
#include <common/time.h>
#include <common/utils.h>
#include <common/align.h>
#include <common/time.h>
-#include <sys/eventfd.h>
#include <sys/stat.h>
#include <time.h>
#include <signal.h>
#include <sys/stat.h>
#include <time.h>
#include <signal.h>
@@
-363,6
+362,10
@@
void fini_thread_state(struct notification_thread_state *state)
ret = cds_lfht_destroy(state->sessions_ht, NULL);
assert(!ret);
}
ret = cds_lfht_destroy(state->sessions_ht, NULL);
assert(!ret);
}
+ if (state->triggers_by_name_uid_ht) {
+ ret = cds_lfht_destroy(state->triggers_by_name_uid_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.
@@
-404,6
+407,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();
@@
-476,6
+480,11
@@
int init_thread_state(struct notification_thread_handle *handle,
if (!state->triggers_ht) {
goto error;
}
if (!state->triggers_ht) {
goto error;
}
+ state->triggers_by_name_uid_ht = cds_lfht_new(DEFAULT_HT_SIZE,
+ 1, 0, CDS_LFHT_AUTO_RESIZE | CDS_LFHT_ACCOUNTING, NULL);
+ if (!state->triggers_by_name_uid_ht) {
+ goto error;
+ }
state->executor = action_executor_create(handle);
if (!state->executor) {
state->executor = action_executor_create(handle);
if (!state->executor) {
This page took
0.026093 seconds
and
4
git commands to generate.