X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fdispatch.cpp;h=a8e8d6c8d44d48f3b712ceac08129fc86d0ac316;hb=63c3462c3dbd028a08f7a9b504c45e178371248d;hp=7988f1ba8a212894dc09d7c3e8338f267b6fb221;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/dispatch.cpp b/src/bin/lttng-sessiond/dispatch.cpp
index 7988f1ba8..a8e8d6c8d 100644
--- a/src/bin/lttng-sessiond/dispatch.cpp
+++ b/src/bin/lttng-sessiond/dispatch.cpp
@@ -21,12 +21,14 @@
 #include "lttng-sessiond.hpp"
 #include "thread.hpp"
 
+namespace {
 struct thread_notifiers {
 	struct ust_cmd_queue *ust_cmd_queue;
 	int apps_cmd_pipe_write_fd;
 	int apps_cmd_notify_pipe_write_fd;
 	int dispatch_thread_exit;
 };
+} /* namespace */
 
 /*
  * For each tracing session, update newly registered apps. The session list
@@ -111,8 +113,7 @@ static void sanitize_wait_queue(struct ust_reg_wait_queue *wait_queue)
 	cds_list_for_each_entry_safe(wait_node, tmp_wait_node,
 			&wait_queue->head, head) {
 		LTTNG_ASSERT(wait_node->app);
-		ret = lttng_poll_add(&events, wait_node->app->sock,
-				LPOLLHUP | LPOLLERR);
+		ret = lttng_poll_add(&events, wait_node->app->sock, LPOLLIN);
 		if (ret < 0) {
 			goto error;
 		}
@@ -282,7 +283,7 @@ static void *thread_dispatch_ust_registration(void *data)
 				break;
 			}
 
-			ust_cmd = caa_container_of(node, struct ust_command, node);
+			ust_cmd = lttng::utils::container_of(node, &ust_command::node);
 
 			DBG("Dispatching UST registration pid:%d ppid:%d uid:%d"
 					" gid:%d sock:%d name:%s (version %d.%d)",
@@ -292,7 +293,7 @@ static void *thread_dispatch_ust_registration(void *data)
 					ust_cmd->reg_msg.major, ust_cmd->reg_msg.minor);
 
 			if (ust_cmd->reg_msg.type == LTTNG_UST_CTL_SOCKET_CMD) {
-				wait_node = (ust_reg_wait_node *) zmalloc(sizeof(*wait_node));
+				wait_node = zmalloc<ust_reg_wait_node>();
 				if (!wait_node) {
 					PERROR("zmalloc wait_node dispatch");
 					ret = close(ust_cmd->sock);
@@ -474,7 +475,7 @@ error:
 		if (node == NULL) {
 			break;
 		}
-		ust_cmd = caa_container_of(node, struct ust_command, node);
+		ust_cmd = lttng::utils::container_of(node, &ust_command::node);
 		ret = close(ust_cmd->sock);
 		if (ret < 0) {
 			PERROR("close ust sock exit dispatch %d", ust_cmd->sock);
@@ -510,7 +511,7 @@ bool launch_ust_dispatch_thread(struct ust_cmd_queue *cmd_queue,
 	struct lttng_thread *thread;
 	struct thread_notifiers *notifiers;
 
-	notifiers = (thread_notifiers *) zmalloc(sizeof(*notifiers));
+	notifiers = zmalloc<thread_notifiers>();
 	if (!notifiers) {
 		goto error;
 	}