X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;fp=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=c00cbfc509c1ff1ae7e75734d23a5cff3353ac36;hb=0d2ff20ef219ec2e407fbc82097346515016290b;hp=b2c36fc1d23ea92292816d7982d711ff8f415053;hpb=55c2a7f9cf105923d1ce86f2deb550bbf7e8062f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index b2c36fc1d..c00cbfc50 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -510,9 +510,6 @@ static void stop_threads(void)
 	/* Dispatch thread */
 	CMM_STORE_SHARED(dispatch_thread_exit, 1);
 	futex_nto1_wake(&ust_cmd_queue.futex);
-
-	/* timer thread */
-	kill(getpid(), LTTNG_SESSIOND_SIG_EXIT);
 }
 
 /*
@@ -5739,6 +5736,11 @@ int main(int argc, char **argv)
 		goto exit_set_signal_handler;
 	}
 
+	if (sessiond_timer_signal_init()) {
+		retval = -1;
+		goto exit_set_signal_handler;
+	}
+
 	setup_consumerd_path();
 
 	page_size = sysconf(_SC_PAGESIZE);
@@ -6565,6 +6567,7 @@ exit_init_data:
 	}
 
 	if (timer_thread_running) {
+		kill(getpid(), LTTNG_SESSIOND_SIG_EXIT);
 		ret = pthread_join(timer_thread, &status);
 		if (ret) {
 			errno = ret;