X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-consumerd%2Flttng-consumerd.cpp;h=47d1e113d25f5201e678ade7e5ad4cc2506a8606;hb=c9e313bc594f40a86eed237dce222c0fc99c957f;hp=dbcda885eede04a0a92a3189a975247de80ce4f2;hpb=657d1bf105996bf8f6e13af697fb1112afa61b28;p=lttng-tools.git

diff --git a/src/bin/lttng-consumerd/lttng-consumerd.cpp b/src/bin/lttng-consumerd/lttng-consumerd.cpp
index dbcda885e..47d1e113d 100644
--- a/src/bin/lttng-consumerd/lttng-consumerd.cpp
+++ b/src/bin/lttng-consumerd/lttng-consumerd.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * SPDX-License-Identifier: GPL-2.0-only
@@ -29,17 +29,17 @@
 #include <urcu/compiler.h>
 #include <ulimit.h>
 
-#include <common/defaults.h>
-#include <common/common.h>
-#include <common/consumer/consumer.h>
-#include <common/consumer/consumer-timer.h>
-#include <common/compat/poll.h>
-#include <common/compat/getenv.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/utils.h>
+#include <common/defaults.hpp>
+#include <common/common.hpp>
+#include <common/consumer/consumer.hpp>
+#include <common/consumer/consumer-timer.hpp>
+#include <common/compat/poll.hpp>
+#include <common/compat/getenv.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/utils.hpp>
 
-#include "lttng-consumerd.h"
-#include "health-consumerd.h"
+#include "lttng-consumerd.hpp"
+#include "health-consumerd.hpp"
 
 /* threads (channel handling, poll, metadata, sessiond) */
 
@@ -82,7 +82,8 @@ enum lttng_consumer_type lttng_consumer_get_type(void)
 /*
  * Signal handler for the daemon
  */
-static void sighandler(int sig, siginfo_t *siginfo, void *arg)
+static void sighandler(int sig, siginfo_t *siginfo,
+		void *arg __attribute__((unused)))
 {
 	if (sig == SIGINT && sigintcount++ == 0) {
 		DBG("ignoring first SIGINT");
@@ -502,7 +503,7 @@ int main(int argc, char **argv)
 
 	/* Create thread to manage the client socket */
 	ret = pthread_create(&health_thread, default_pthread_attr(),
-			thread_manage_health, (void *) NULL);
+			thread_manage_health_consumerd, (void *) NULL);
 	if (ret) {
 		errno = ret;
 		PERROR("pthread_create health");