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

diff --git a/src/bin/lttng-sessiond/timer.c b/src/bin/lttng-sessiond/timer.c
index c65df5c2d..bf56d9306 100644
--- a/src/bin/lttng-sessiond/timer.c
+++ b/src/bin/lttng-sessiond/timer.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2017 - Julien Desfossez <jdesfossez@efficios.com>
- * Copyright (C) 2018 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -154,7 +144,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;
@@ -356,7 +346,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. */
@@ -410,7 +400,7 @@ void *thread_timer(void *data)
 
 end:
 	DBG("[timer-thread] Exit");
-	health_unregister(health_sessiond);
+	health_unregister(the_health_sessiond);
 	rcu_thread_offline();
 	rcu_unregister_thread();
 	return NULL;