projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: use global thread quit pipe in live
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.c
diff --git
a/src/bin/lttng-relayd/main.c
b/src/bin/lttng-relayd/main.c
index dffcaff9855a61b265bba6b3eb376a990188a76e..dc41caad031dade163e0353c008c5371edbec7b3 100644
(file)
--- a/
src/bin/lttng-relayd/main.c
+++ b/
src/bin/lttng-relayd/main.c
@@
-2527,7
+2527,7
@@
int main(int argc, char **argv)
goto exit_listener;
}
goto exit_listener;
}
- ret = live_start_threads(live_uri, relay_ctx);
+ ret = live_start_threads(live_uri, relay_ctx
, thread_quit_pipe
);
if (ret != 0) {
ERR("Starting live viewer threads");
}
if (ret != 0) {
ERR("Starting live viewer threads");
}
@@
-2552,6
+2552,8
@@
exit_dispatcher:
PERROR("pthread_join");
goto error; /* join error, exit without cleanup */
}
PERROR("pthread_join");
goto error; /* join error, exit without cleanup */
}
+
+ live_stop_threads();
lttng_ht_destroy(viewer_streams_ht);
exit_relay_ctx_viewer_streams:
lttng_ht_destroy(viewer_streams_ht);
exit_relay_ctx_viewer_streams:
@@
-2564,7
+2566,6
@@
exit_relay_ctx_sessions:
free(relay_ctx);
exit:
free(relay_ctx);
exit:
- live_stop_threads();
cleanup();
if (!ret) {
exit(EXIT_SUCCESS);
cleanup();
if (!ret) {
exit(EXIT_SUCCESS);
This page took
0.024403 seconds
and
4
git commands to generate.