X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=dc41caad031dade163e0353c008c5371edbec7b3;hb=424150266e9afc978cca8d00f1d70c31f534e656;hp=dffcaff9855a61b265bba6b3eb376a990188a76e;hpb=b92fdc2bf5e3474d62c8d1c554ddd2a8fd2c043c;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index dffcaff98..dc41caad0 100644
--- 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;
 	}
 
-	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");
 	}
@@ -2552,6 +2552,8 @@ exit_dispatcher:
 		PERROR("pthread_join");
 		goto error;	/* join error, exit without cleanup */
 	}
+
+	live_stop_threads();
 	lttng_ht_destroy(viewer_streams_ht);
 
 exit_relay_ctx_viewer_streams:
@@ -2564,7 +2566,6 @@ exit_relay_ctx_sessions:
 	free(relay_ctx);
 
 exit:
-	live_stop_threads();
 	cleanup();
 	if (!ret) {
 		exit(EXIT_SUCCESS);