X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.cpp;h=23a99a1acbbb7ec94458ad79a5dc7d9a85ba68ee;hb=f149493493fbd8a3efa4748832c03278c96c38ca;hp=cc481e5b74fad316b6354306b9f7c3f5fe743545;hpb=64803277bbdbe0a943360d918298a48157d9da55;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/action-executor.cpp b/src/bin/lttng-sessiond/action-executor.cpp
index cc481e5b7..23a99a1ac 100644
--- a/src/bin/lttng-sessiond/action-executor.cpp
+++ b/src/bin/lttng-sessiond/action-executor.cpp
@@ -36,6 +36,20 @@
 #define THREAD_NAME "Action Executor"
 #define MAX_QUEUED_WORK_COUNT 8192
 
+struct action_executor {
+	struct lttng_thread *thread;
+	struct notification_thread_handle *notification_thread_handle;
+	struct {
+		uint64_t pending_count;
+		struct cds_list_head list;
+		pthread_cond_t cond;
+		pthread_mutex_t lock;
+	} work;
+	bool should_quit;
+	uint64_t next_work_item_id;
+};
+
+namespace {
 /*
  * A work item is composed of a dynamic array of sub-items which
  * represent a flattened, and augmented, version of a trigger's actions.
@@ -69,7 +83,6 @@
  * trigger object at the moment of execution, if the trigger is found to be
  * unregistered, the execution is skipped.
  */
-
 struct action_work_item {
 	uint64_t id;
 
@@ -94,19 +107,8 @@ struct action_work_subitem {
 		LTTNG_OPTIONAL(uint64_t) session_id;
 	} context;
 };
+} /* namespace */
 
-struct action_executor {
-	struct lttng_thread *thread;
-	struct notification_thread_handle *notification_thread_handle;
-	struct {
-		uint64_t pending_count;
-		struct cds_list_head list;
-		pthread_cond_t cond;
-		pthread_mutex_t lock;
-	} work;
-	bool should_quit;
-	uint64_t next_work_item_id;
-};
 
 /*
  * Only return non-zero on a fatal error that should shut down the action
@@ -233,6 +235,15 @@ static int client_handle_transmission_status(
 	case CLIENT_TRANSMISSION_STATUS_COMPLETE:
 		DBG("Successfully sent full notification to client, client_id = %" PRIu64,
 				client->id);
+		/*
+		 * There is no need to wake the (e)poll thread. If it was waiting for
+		 * "out" events on the client's socket, it will see that no payload
+		 * in queued and will unsubscribe from that event.
+		 *
+		 * In the other cases, we have to wake the the (e)poll thread to either
+		 * handle the error on the client or to get it to monitor the client "out"
+		 * events.
+		 */
 		update_communication = false;
 		break;
 	case CLIENT_TRANSMISSION_STATUS_QUEUED: