X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftimer.c;h=4e522a7fc70e4770b30904cd0ddd01065f8c2bd9;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=56fc4635a312211a8772330fcfec7c57816e407e;hpb=ab5be9fa2eb5ba9600a82cd18fd3cfcbac69169a;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/timer.c b/src/bin/lttng-sessiond/timer.c
index 56fc4635a..4e522a7fc 100644
--- a/src/bin/lttng-sessiond/timer.c
+++ b/src/bin/lttng-sessiond/timer.c
@@ -7,7 +7,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <inttypes.h>
 #include <signal.h>
 
@@ -23,7 +22,7 @@
 
 #define UINT_TO_PTR(value)				\
 	({						\
-		assert(value <= UINTPTR_MAX);		\
+		LTTNG_ASSERT(value <= UINTPTR_MAX);		\
 		(void *) (uintptr_t) value;		\
 	})
 #define PTR_TO_UINT(ptr) ((uintptr_t) ptr)
@@ -144,7 +143,7 @@ int timer_start(timer_t *timer_id, struct ltt_session *session,
 		unsigned int timer_interval_us, int signal, bool one_shot)
 {
 	int ret = 0, delete_ret;
-	struct sigevent sev;
+	struct sigevent sev = {};
 	struct itimerspec its;
 
 	sev.sigev_notify = SIGEV_SIGNAL;
@@ -238,8 +237,8 @@ int timer_session_rotation_pending_check_stop(struct ltt_session *session)
 {
 	int ret;
 
-	assert(session);
-	assert(session->rotation_pending_check_timer_enabled);
+	LTTNG_ASSERT(session);
+	LTTNG_ASSERT(session->rotation_pending_check_timer_enabled);
 
 	DBG("Disabling session rotation pending check timer on session %" PRIu64,
 			session->id);
@@ -289,7 +288,7 @@ int timer_session_rotation_schedule_timer_stop(struct ltt_session *session)
 {
 	int ret = 0;
 
-	assert(session);
+	LTTNG_ASSERT(session);
 
 	if (!session->rotation_schedule_timer_enabled) {
 		goto end;
@@ -346,7 +345,7 @@ void *thread_timer(void *data)
 	rcu_register_thread();
 	rcu_thread_online();
 
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_TIMER);
+	health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_TIMER);
 	health_code_update();
 
 	/* Only self thread will receive signal mask. */
@@ -394,13 +393,13 @@ void *thread_timer(void *data)
 			 * still fire.
 			 */
 		} else {
-			ERR("Unexpected signal %d\n", info.si_signo);
+			ERR("Unexpected signal %d", info.si_signo);
 		}
 	}
 
 end:
-	DBG("[timer-thread] Exit");
-	health_unregister(health_sessiond);
+	DBG("Thread exit");
+	health_unregister(the_health_sessiond);
 	rcu_thread_offline();
 	rcu_unregister_thread();
 	return NULL;