X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fregister.c;h=ac1583dc24eb8f3610dfcb481d8cfb19b726d962;hp=c7e3de66ff1f22ac378731b8228f10b84634a30f;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=a13091b7aca3f36a14ef748aee590ad00c7a7652

diff --git a/src/bin/lttng-sessiond/register.c b/src/bin/lttng-sessiond/register.c
index c7e3de66f..ac1583dc2 100644
--- a/src/bin/lttng-sessiond/register.c
+++ b/src/bin/lttng-sessiond/register.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 <stddef.h>
@@ -22,6 +12,7 @@
 #include <urcu.h>
 #include <common/futex.h>
 #include <common/macros.h>
+#include <common/shm.h>
 #include <common/utils.h>
 #include <sys/stat.h>
 
@@ -30,7 +21,6 @@
 #include "testpoint.h"
 #include "health-sessiond.h"
 #include "fd-limit.h"
-#include "shm.h"
 #include "utils.h"
 #include "thread.h"
 
@@ -175,7 +165,7 @@ static void *thread_application_registration(void *data)
 
 	DBG("[thread] Manage application registration started");
 
-	pthread_cleanup_push(thread_init_cleanup, NULL);
+	pthread_cleanup_push(thread_init_cleanup, thread_state);
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_REG);
 
 	ret = lttcomm_listen_unix_sock(application_socket);
@@ -183,10 +173,6 @@ static void *thread_application_registration(void *data)
 		goto error_listen;
 	}
 
-	if (testpoint(sessiond_thread_registration_apps)) {
-		goto error_create_poll;
-	}
-
 	/*
 	 * Pass 2 as size here for the thread quit pipe and apps_sock. Nothing
 	 * more will be added to this poll set.
@@ -211,6 +197,10 @@ static void *thread_application_registration(void *data)
 	set_thread_status(thread_state, true);
 	pthread_cleanup_pop(0);
 
+	if (testpoint(sessiond_thread_registration_apps)) {
+		goto error_poll_add;
+	}
+
 	while (1) {
 		DBG("Accepting application registration");
 
@@ -278,6 +268,7 @@ static void *thread_application_registration(void *data)
 						if (ret) {
 							PERROR("close");
 						}
+						sock = -1;
 						goto error;
 					}