projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Load session configurations from lttng-sessiond's main thread
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
agent-thread.c
diff --git
a/src/bin/lttng-sessiond/agent-thread.c
b/src/bin/lttng-sessiond/agent-thread.c
index e648eda1ebfe9bcb95d3c7de516f70efad696edc..9c98d30ab4e71accd303a442d41b45feeee212b6 100644
(file)
--- a/
src/bin/lttng-sessiond/agent-thread.c
+++ b/
src/bin/lttng-sessiond/agent-thread.c
@@
-454,7
+454,6
@@
error_tcp_socket:
error_poll_create:
uatomic_set(&agent_tracing_enabled, 0);
DBG("[agent-thread] Cleaning up and stopping.");
error_poll_create:
uatomic_set(&agent_tracing_enabled, 0);
DBG("[agent-thread] Cleaning up and stopping.");
- lttng_pipe_destroy(quit_pipe);
rcu_thread_offline();
rcu_unregister_thread();
return NULL;
rcu_thread_offline();
rcu_unregister_thread();
return NULL;
@@
-468,7
+467,14
@@
static bool shutdown_agent_management_thread(void *data)
return notify_thread_pipe(write_fd) == 1;
}
return notify_thread_pipe(write_fd) == 1;
}
-bool launch_agent_registration_thread(void)
+static void cleanup_agent_management_thread(void *data)
+{
+ struct lttng_pipe *quit_pipe = data;
+
+ lttng_pipe_destroy(quit_pipe);
+}
+
+bool launch_agent_management_thread(void)
{
struct lttng_pipe *quit_pipe;
struct lttng_thread *thread;
{
struct lttng_pipe *quit_pipe;
struct lttng_thread *thread;
@@
-480,6
+486,7
@@
bool launch_agent_registration_thread(void)
thread = lttng_thread_create("Agent management",
thread_agent_management,
shutdown_agent_management_thread,
thread = lttng_thread_create("Agent management",
thread_agent_management,
shutdown_agent_management_thread,
+ cleanup_agent_management_thread,
quit_pipe);
if (!thread) {
goto error;
quit_pipe);
if (!thread) {
goto error;
@@
-488,6
+495,6
@@
bool launch_agent_registration_thread(void)
lttng_thread_put(thread);
return true;
error:
lttng_thread_put(thread);
return true;
error:
-
lttng_pipe_destroy
(quit_pipe);
+
cleanup_agent_management_thread
(quit_pipe);
return false;
}
return false;
}
This page took
0.025357 seconds
and
4
git commands to generate.