X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.c;h=a56f02d1b1ccc264a4178b534ed189e377a45bae;hb=38303ec83b84d67c1a2a3b16c972c5a652798c8c;hp=764cf4cb0f59ff981629c99078b31676d0f700b2;hpb=6bf8b7f3d399057540d8fc58f3e7b0b408e31e24;p=lttng-tools.git

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.c b/src/bin/lttng-consumerd/lttng-consumerd.c
index 764cf4cb0..a56f02d1b 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/src/bin/lttng-consumerd/lttng-consumerd.c
@@ -109,7 +109,9 @@ static void sighandler(int sig)
 		return;
 	}
 
-	lttng_consumer_should_exit(ctx);
+	if (ctx) {
+		lttng_consumer_should_exit(ctx);
+	}
 }
 
 /*
@@ -312,6 +314,7 @@ int main(int argc, char **argv)
 {
 	int ret = 0, retval = 0;
 	void *status;
+	struct lttng_consumer_local_data *tmp_ctx;
 
 	if (set_signal_handler()) {
 		retval = -1;
@@ -419,6 +422,10 @@ int main(int argc, char **argv)
 		set_ulimit();
 	}
 
+	if (run_as_create_worker(argv[0]) < 0) {
+		goto exit_init_data;
+	}
+
 	/* create the consumer instance with and assign the callbacks */
 	ctx = lttng_consumer_create(opt_type, lttng_consumer_read_subbuffer,
 		NULL, lttng_consumer_on_recv_stream, NULL);
@@ -626,19 +633,23 @@ exit_health_thread:
 exit_health_pipe:
 
 exit_init_data:
-	lttng_consumer_destroy(ctx);
+	tmp_ctx = ctx;
+	ctx = NULL;
+	cmm_barrier();	/* Clear ctx for signal handler. */
+	lttng_consumer_destroy(tmp_ctx);
 	lttng_consumer_cleanup();
 
 	if (health_consumerd) {
 		health_app_destroy(health_consumerd);
 	}
-exit_health_consumerd_cleanup:
+	/* Ensure all prior call_rcu are done. */
+	rcu_barrier();
 
-exit_options:
+	run_as_destroy_worker();
 
+exit_health_consumerd_cleanup:
+exit_options:
 exit_set_signal_handler:
-	/* Ensure all prior call_rcu are done. */
-	rcu_barrier();
 
 	if (!retval) {
 		exit(EXIT_SUCCESS);