X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftimer.c;h=c65df5c2dc132706b1a6335e0d73ecff10eabf00;hp=4bff7bd76cea0497c311f12b7026b0142761710c;hb=f17b873261bab722b58f21aabd3fcb44a0bbc20d;hpb=c7031a2c707646804e0088d069578d5eb74fc01e

diff --git a/src/bin/lttng-sessiond/timer.c b/src/bin/lttng-sessiond/timer.c
index 4bff7bd76..c65df5c2d 100644
--- a/src/bin/lttng-sessiond/timer.c
+++ b/src/bin/lttng-sessiond/timer.c
@@ -24,6 +24,7 @@
 #include "timer.h"
 #include "health-sessiond.h"
 #include "rotation-thread.h"
+#include "thread.h"
 
 #define LTTNG_SESSIOND_SIG_QS				SIGRTMIN + 10
 #define LTTNG_SESSIOND_SIG_EXIT				SIGRTMIN + 11
@@ -248,6 +249,7 @@ int timer_session_rotation_pending_check_stop(struct ltt_session *session)
 	int ret;
 
 	assert(session);
+	assert(session->rotation_pending_check_timer_enabled);
 
 	DBG("Disabling session rotation pending check timer on session %" PRIu64,
 			session->id);
@@ -277,8 +279,8 @@ int timer_session_rotation_schedule_timer_start(struct ltt_session *session,
 		ret = -1;
 		goto end;
 	}
-	DBG("Enabling scheduled rotation timer on session \"%s\" (%ui µs)", session->name,
-			interval_us);
+	DBG("Enabling scheduled rotation timer on session \"%s\" (%ui %s)", session->name,
+			interval_us, USEC_UNIT);
 	ret = timer_start(&session->rotation_schedule_timer, session,
 			interval_us, LTTNG_SESSIOND_SIG_SCHEDULED_ROTATION,
 			/* one-shot */ false);
@@ -343,7 +345,8 @@ int timer_signal_init(void)
 /*
  * This thread is the sighandler for the timer signals.
  */
-void *timer_thread_func(void *data)
+static
+void *thread_timer(void *data)
 {
 	int signr;
 	sigset_t mask;
@@ -390,9 +393,6 @@ void *timer_thread_func(void *data)
 			rotation_thread_enqueue_job(ctx->rotation_thread_job_queue,
 					ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION,
 					session);
-			session_lock_list();
-			session_put(session);
-			session_unlock_list();
 		} else if (signr == LTTNG_SESSIOND_SIG_SCHEDULED_ROTATION) {
 			rotation_thread_enqueue_job(ctx->rotation_thread_job_queue,
 					ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION,
@@ -416,7 +416,27 @@ end:
 	return NULL;
 }
 
-void timer_exit(void)
+static
+bool shutdown_timer_thread(void *data)
+{
+	return kill(getpid(), LTTNG_SESSIOND_SIG_EXIT) == 0;
+}
+
+bool launch_timer_thread(
+		struct timer_thread_parameters *timer_thread_parameters)
 {
-	kill(getpid(), LTTNG_SESSIOND_SIG_EXIT);
+	struct lttng_thread *thread;
+
+	thread = lttng_thread_create("Timer",
+			thread_timer,
+			shutdown_timer_thread,
+			NULL,
+			timer_thread_parameters);
+	if (!thread) {
+		goto error;
+	}
+	lttng_thread_put(thread);
+	return true;
+error:
+	return false;
 }