X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmanage-apps.c;h=e2f3ed26a602a1743a5f6ea827366cc8cb82423f;hb=c0e2990d32d1e55c783c7eb3299f23a7ce062270;hp=6ef0351fe8088f16b2d35cb8f0c66dca2700ea3f;hpb=7649924e1b3a80687c2fb79f8778e08bedb671ce;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/manage-apps.c b/src/bin/lttng-sessiond/manage-apps.c
index 6ef0351fe..e2f3ed26a 100644
--- a/src/bin/lttng-sessiond/manage-apps.c
+++ b/src/bin/lttng-sessiond/manage-apps.c
@@ -1,20 +1,10 @@
 /*
- * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
- *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *               2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2011 David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 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.
  */
 
 #include "manage-apps.h"
@@ -64,7 +54,7 @@ static void *thread_application_management(void *data)
 	rcu_register_thread();
 	rcu_thread_online();
 
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_MANAGE);
+	health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_APP_MANAGE);
 
 	if (testpoint(sessiond_thread_manage_apps)) {
 		goto error_testpoint;
@@ -123,11 +113,6 @@ static void *thread_application_management(void *data)
 
 			health_code_update();
 
-			if (!revents) {
-				/* No activity for this FD (poll implementation). */
-				continue;
-			}
-
 			if (pollfd == quit_pipe_read_fd) {
 				err = 0;
 				goto exit;
@@ -205,7 +190,7 @@ error_testpoint:
 		health_error();
 		ERR("Health error occurred in %s", __func__);
 	}
-	health_unregister(health_sessiond);
+	health_unregister(the_health_sessiond);
 	DBG("Application communication apps thread cleanup complete");
 	rcu_thread_offline();
 	rcu_unregister_thread();
@@ -226,13 +211,12 @@ bool launch_application_management_thread(int apps_cmd_pipe_read_fd)
 	struct thread_notifiers *notifiers = NULL;
 	struct lttng_thread *thread;
 
-	quit_pipe = lttng_pipe_open(FD_CLOEXEC);
-	if (!quit_pipe) {
-		goto error;
-	}
-
 	notifiers = zmalloc(sizeof(*notifiers));
 	if (!notifiers) {
+		goto error_alloc;
+	}
+	quit_pipe = lttng_pipe_open(FD_CLOEXEC);
+	if (!quit_pipe) {
 		goto error;
 	}
 	notifiers->quit_pipe = quit_pipe;
@@ -251,5 +235,6 @@ bool launch_application_management_thread(int apps_cmd_pipe_read_fd)
 	return true;
 error:
 	cleanup_application_management_thread(notifiers);
+error_alloc:
 	return false;
 }