X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fht-cleanup.c;h=8de175d11d50383ee07994fc49feeb563f77683b;hp=beb4e89dc8e71eff082cef0350a87e5f98eb14b0;hb=4064563ea326f6f26d2c458009beb9ebdb3ba840;hpb=1a1a34b40ab10a195633b1ed5e2e9b42fdae0a78

diff --git a/src/bin/lttng-sessiond/ht-cleanup.c b/src/bin/lttng-sessiond/ht-cleanup.c
index beb4e89dc..8de175d11 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
@@ -27,8 +17,9 @@
 #include "health-sessiond.h"
 #include "testpoint.h"
 #include "utils.h"
+#include "ht-cleanup.h"
 
-int ht_cleanup_quit_pipe[2] = { -1, -1 };
+static int ht_cleanup_quit_pipe[2] = { -1, -1 };
 
 /*
  * Check if the ht_cleanup thread quit pipe was triggered.
@@ -91,6 +82,12 @@ error:
 	return ret;
 }
 
+static void cleanup_ht_cleanup_thread(void *data)
+{
+	utils_close_pipe(ht_cleanup_quit_pipe);
+	utils_close_pipe(ht_cleanup_pipe);
+}
+
 static void *thread_ht_cleanup(void *data)
 {
 	int ret, i, pollfd, err = -1;
@@ -121,6 +118,7 @@ static void *thread_ht_cleanup(void *data)
 	health_code_update();
 
 	while (1) {
+	restart:
 		DBG3("[ht-thread] Polling.");
 		health_poll_entry();
 		ret = lttng_poll_wait(&events, -1);
@@ -147,11 +145,6 @@ 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]) {
 				continue;
 			}
@@ -174,6 +167,13 @@ static void *thread_ht_cleanup(void *data)
 				lttng_ht_destroy(ht);
 
 				health_code_update();
+
+				/*
+				 * Ensure that we never process the quit pipe
+				 * event while there is still data available
+				 * on the ht clean pipe.
+				 */
+				goto restart;
 			} else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) {
 				ERR("ht cleanup pipe error");
 				goto error;
@@ -225,55 +225,44 @@ error_testpoint:
 	return NULL;
 }
 
-int init_ht_cleanup_thread(pthread_t *thread)
+static bool shutdown_ht_cleanup_thread(void *data)
 {
 	int ret;
 
-	ret = init_pipe(ht_cleanup_pipe);
-	if (ret) {
-		goto error;
-	}
-
-	init_pipe(ht_cleanup_quit_pipe);
-	if (ret) {
-		goto error_quit_pipe;
-	}
-
-	ret = pthread_create(thread, default_pthread_attr(), thread_ht_cleanup,
-			NULL);
-	if (ret) {
-		errno = ret;
-		PERROR("pthread_create ht_cleanup");
-		goto error_thread;
+	ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
+	if (ret < 0) {
+		ERR("write error on ht_cleanup quit pipe");
+		goto end;
 	}
-
-error:
-	return ret;
-
-error_thread:
-	utils_close_pipe(ht_cleanup_quit_pipe);
-error_quit_pipe:
-	utils_close_pipe(ht_cleanup_pipe);
+end:
 	return ret;
 }
 
-int fini_ht_cleanup_thread(pthread_t *thread)
+struct lttng_thread *launch_ht_cleanup_thread(void)
 {
 	int ret;
+	struct lttng_thread *thread;
 
-	ret = notify_thread_pipe(ht_cleanup_quit_pipe[1]);
-	if (ret < 0) {
-		ERR("write error on ht_cleanup quit pipe");
-		goto end;
+	ret = init_pipe(ht_cleanup_pipe);
+	if (ret) {
+		goto error;
 	}
 
-	ret = pthread_join(*thread, NULL);
+	ret = init_pipe(ht_cleanup_quit_pipe);
 	if (ret) {
-		errno = ret;
-		PERROR("pthread_join ht cleanup thread");
+		goto error;
 	}
-	utils_close_pipe(ht_cleanup_pipe);
-	utils_close_pipe(ht_cleanup_quit_pipe);
-end:
-	return ret;
+
+	thread = lttng_thread_create("HT cleanup",
+			thread_ht_cleanup,
+			shutdown_ht_cleanup_thread,
+			cleanup_ht_cleanup_thread,
+			NULL);
+	if (!thread) {
+		goto error;
+	}
+	return thread;
+error:
+	cleanup_ht_cleanup_thread(NULL);
+	return NULL;
 }