X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fht-cleanup.c;h=c670baf49d78b951888a7e220cf6bfb646f32840;hb=5c5373c3cbfebddb0068fe13600766bb381048da;hp=91c0544c3c8a28c8c8391b1d5f76b0927a48bab5;hpb=df119599f9c1994b5f4a9f6f562581bee13c0f13;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c
index 91c0544c3..c670baf49 100644
--- a/src/bin/lttng-sessiond/ht-cleanup.c
+++ b/src/bin/lttng-sessiond/ht-cleanup.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2013 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@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
@@ -80,7 +70,7 @@ static int set_pollset(struct lttng_poll_event *events, size_t size)
 		goto error;
 	}
 
-	ret = lttng_poll_add(events, ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);
+	ret = lttng_poll_add(events, the_ht_cleanup_pipe[0], LPOLLIN | LPOLLERR);
 	if (ret < 0) {
 		DBG("[ht-thread] lttng_poll_add error %d.", ret);
 		goto error;
@@ -95,7 +85,7 @@ error:
 static void cleanup_ht_cleanup_thread(void *data)
 {
 	utils_close_pipe(ht_cleanup_quit_pipe);
-	utils_close_pipe(ht_cleanup_pipe);
+	utils_close_pipe(the_ht_cleanup_pipe);
 }
 
 static void *thread_ht_cleanup(void *data)
@@ -110,7 +100,7 @@ static void *thread_ht_cleanup(void *data)
 	rcu_register_thread();
 	rcu_thread_online();
 
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
+	health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_HT_CLEANUP);
 
 	if (testpoint(sessiond_thread_ht_cleanup)) {
 		DBG("[ht-thread] testpoint.");
@@ -155,19 +145,14 @@ static void *thread_ht_cleanup(void *data)
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
-			if (!revents) {
-				/* No activity for this FD (poll implementation). */
-				continue;
-			}
-
-			if (pollfd != ht_cleanup_pipe[0]) {
+			if (pollfd != the_ht_cleanup_pipe[0]) {
 				continue;
 			}
 
 			if (revents & LPOLLIN) {
 				/* Get socket from dispatch thread. */
-				size_ret = lttng_read(ht_cleanup_pipe[0], &ht,
-						sizeof(ht));
+				size_ret = lttng_read(the_ht_cleanup_pipe[0],
+						&ht, sizeof(ht));
 				if (size_ret < sizeof(ht)) {
 					PERROR("ht cleanup notify pipe");
 					goto error;
@@ -210,7 +195,7 @@ static void *thread_ht_cleanup(void *data)
 				continue;
 			}
 
-			if (pollfd == ht_cleanup_pipe[0]) {
+			if (pollfd == the_ht_cleanup_pipe[0]) {
 				continue;
 			}
 
@@ -234,7 +219,7 @@ error_testpoint:
 		health_error();
 		ERR("Health error occurred in %s", __func__);
 	}
-	health_unregister(health_sessiond);
+	health_unregister(the_health_sessiond);
 	rcu_thread_offline();
 	rcu_unregister_thread();
 	return NULL;
@@ -258,7 +243,7 @@ struct lttng_thread *launch_ht_cleanup_thread(void)
 	int ret;
 	struct lttng_thread *thread;
 
-	ret = init_pipe(ht_cleanup_pipe);
+	ret = init_pipe(the_ht_cleanup_pipe);
 	if (ret) {
 		goto error;
 	}
@@ -274,7 +259,6 @@ struct lttng_thread *launch_ht_cleanup_thread(void)
 			cleanup_ht_cleanup_thread,
 			NULL);
 	if (!thread) {
-		ret = -1;
 		goto error;
 	}
 	return thread;