X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fagent-thread.c;h=9c98d30ab4e71accd303a442d41b45feeee212b6;hb=45f6525f9009f0bcaa71842690702bf123d89678;hp=51221c4c623fc34a08f1f9c9cb8e90d4177cd8f6;hpb=48a86f68b90760c061cbefeec89667b19860c300;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/agent-thread.c b/src/bin/lttng-sessiond/agent-thread.c
index 51221c4c6..9c98d30ab 100644
--- a/src/bin/lttng-sessiond/agent-thread.c
+++ b/src/bin/lttng-sessiond/agent-thread.c
@@ -31,6 +31,7 @@
 #include "lttng-sessiond.h"
 #include "session.h"
 #include "utils.h"
+#include "thread.h"
 
 static int agent_tracing_enabled = -1;
 
@@ -295,12 +296,14 @@ static int write_agent_port(uint16_t port)
 /*
  * This thread manage application notify communication.
  */
-void *agent_thread_manage_registration(void *data)
+static void *thread_agent_management(void *data)
 {
 	int i, ret, pollfd;
 	uint32_t revents, nb_fd;
 	struct lttng_poll_event events;
 	struct lttcomm_sock *reg_sock;
+	struct lttng_pipe *quit_pipe = data;
+	const int quit_pipe_read_fd = lttng_pipe_get_readfd(quit_pipe);
 
 	DBG("[agent-thread] Manage agent application registration.");
 
@@ -310,13 +313,18 @@ void *agent_thread_manage_registration(void *data)
 	/* Agent initialization call MUST be called before starting the thread. */
 	assert(agent_apps_ht_by_sock);
 
-	/* Create pollset with size 2, quit pipe and socket. */
-	ret = sessiond_set_thread_pollset(&events, 2);
+	/* Create pollset with size 2, quit pipe and registration socket. */
+	ret = lttng_poll_create(&events, 2, LTTNG_CLOEXEC);
 	if (ret < 0) {
-		sessiond_notify_ready();
 		goto error_poll_create;
 	}
 
+	ret = lttng_poll_add(&events, quit_pipe_read_fd,
+			LPOLLIN | LPOLLERR);
+	if (ret < 0) {
+		goto error_tcp_socket;
+	}
+
 	reg_sock = init_tcp_socket();
 	if (reg_sock) {
 		uint16_t port;
@@ -381,8 +389,7 @@ restart:
 			}
 
 			/* Thread quit pipe has been closed. Killing thread. */
-			ret = sessiond_check_thread_quit_pipe(pollfd, revents);
-			if (ret) {
+			if (pollfd == quit_pipe_read_fd) {
 				goto exit;
 			}
 
@@ -446,9 +453,48 @@ error_tcp_socket:
 	lttng_poll_clean(&events);
 error_poll_create:
 	uatomic_set(&agent_tracing_enabled, 0);
-	DBG("[agent-thread] is cleaning up and stopping.");
-
+	DBG("[agent-thread] Cleaning up and stopping.");
 	rcu_thread_offline();
 	rcu_unregister_thread();
 	return NULL;
 }
+
+static bool shutdown_agent_management_thread(void *data)
+{
+	struct lttng_pipe *quit_pipe = data;
+	const int write_fd = lttng_pipe_get_writefd(quit_pipe);
+
+	return notify_thread_pipe(write_fd) == 1;
+}
+
+static void cleanup_agent_management_thread(void *data)
+{
+	struct lttng_pipe *quit_pipe = data;
+
+	lttng_pipe_destroy(quit_pipe);
+}
+
+bool launch_agent_management_thread(void)
+{
+	struct lttng_pipe *quit_pipe;
+	struct lttng_thread *thread;
+
+	quit_pipe = lttng_pipe_open(FD_CLOEXEC);
+	if (!quit_pipe) {
+		goto error;
+	}
+	thread = lttng_thread_create("Agent management",
+			thread_agent_management,
+			shutdown_agent_management_thread,
+			cleanup_agent_management_thread,
+			quit_pipe);
+	if (!thread) {
+		goto error;
+	}
+
+	lttng_thread_put(thread);
+	return true;
+error:
+	cleanup_agent_management_thread(quit_pipe);
+	return false;
+}