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

diff --git a/src/bin/lttng-sessiond/action-executor.cpp b/src/bin/lttng-sessiond/action-executor.cpp
index 032ac11a0..cc481e5b7 100644
--- a/src/bin/lttng-sessiond/action-executor.cpp
+++ b/src/bin/lttng-sessiond/action-executor.cpp
@@ -5,29 +5,29 @@
  *
  */
 
-#include "action-executor.h"
-#include "cmd.h"
-#include "health-sessiond.h"
-#include "lttng-sessiond.h"
-#include "notification-thread-internal.h"
-#include "session.h"
-#include "thread.h"
-#include <common/dynamic-array.h>
-#include <common/macros.h>
-#include <common/optional.h>
-#include <lttng/action/action-internal.h>
-#include <lttng/action/list-internal.h>
+#include "action-executor.hpp"
+#include "cmd.hpp"
+#include "health-sessiond.hpp"
+#include "lttng-sessiond.hpp"
+#include "notification-thread-internal.hpp"
+#include "session.hpp"
+#include "thread.hpp"
+#include <common/dynamic-array.hpp>
+#include <common/macros.hpp>
+#include <common/optional.hpp>
+#include <lttng/action/action-internal.hpp>
+#include <lttng/action/list-internal.hpp>
 #include <lttng/action/list.h>
-#include <lttng/action/notify-internal.h>
+#include <lttng/action/notify-internal.hpp>
 #include <lttng/action/notify.h>
 #include <lttng/action/rotate-session.h>
 #include <lttng/action/snapshot-session.h>
 #include <lttng/action/start-session.h>
 #include <lttng/action/stop-session.h>
 #include <lttng/condition/evaluation.h>
-#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/event-rule-matches-internal.hpp>
 #include <lttng/lttng-error.h>
-#include <lttng/trigger/trigger-internal.h>
+#include <lttng/trigger/trigger-internal.hpp>
 #include <pthread.h>
 #include <stdbool.h>
 #include <stddef.h>
@@ -264,7 +264,7 @@ end:
 
 static int action_executor_notify_handler(struct action_executor *executor,
 		const struct action_work_item *work_item,
-		struct action_work_subitem *item)
+		struct action_work_subitem *item __attribute__((unused)))
 {
 	return notification_client_list_send_evaluation(work_item->client_list,
 			work_item->trigger,
@@ -276,7 +276,7 @@ static int action_executor_notify_handler(struct action_executor *executor,
 }
 
 static int action_executor_start_session_handler(
-		struct action_executor *executor,
+		struct action_executor *executor __attribute__((unused)),
 		const struct action_work_item *work_item,
 		struct action_work_subitem *item)
 {
@@ -309,6 +309,7 @@ static int action_executor_start_session_handler(
 	}
 
 	session_lock_list();
+	rcu_read_lock();
 	session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id));
 	if (!session) {
 		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
@@ -353,13 +354,14 @@ error_unlock_session:
 	session_unlock(session);
 	session_put(session);
 error_unlock_list:
+	rcu_read_unlock();
 	session_unlock_list();
 end:
 	return ret;
 }
 
 static int action_executor_stop_session_handler(
-		struct action_executor *executor,
+		struct action_executor *executor __attribute__((unused)),
 		const struct action_work_item *work_item,
 		struct action_work_subitem *item)
 {
@@ -392,6 +394,7 @@ static int action_executor_stop_session_handler(
 	}
 
 	session_lock_list();
+	rcu_read_lock();
 	session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id));
 	if (!session) {
 		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
@@ -436,13 +439,14 @@ error_unlock_session:
 	session_unlock(session);
 	session_put(session);
 error_unlock_list:
+	rcu_read_unlock();
 	session_unlock_list();
 end:
 	return ret;
 }
 
 static int action_executor_rotate_session_handler(
-		struct action_executor *executor,
+		struct action_executor *executor __attribute__((unused)),
 		const struct action_work_item *work_item,
 		struct action_work_subitem *item)
 {
@@ -475,6 +479,7 @@ static int action_executor_rotate_session_handler(
 	}
 
 	session_lock_list();
+	rcu_read_lock();
 	session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id));
 	if (!session) {
 		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
@@ -526,13 +531,14 @@ error_unlock_session:
 	session_unlock(session);
 	session_put(session);
 error_unlock_list:
+	rcu_read_unlock();
 	session_unlock_list();
 end:
 	return ret;
 }
 
 static int action_executor_snapshot_session_handler(
-		struct action_executor *executor,
+		struct action_executor *executor __attribute__((unused)),
 		const struct action_work_item *work_item,
 		struct action_work_subitem *item)
 {
@@ -580,6 +586,7 @@ static int action_executor_snapshot_session_handler(
 	}
 
 	session_lock_list();
+	rcu_read_lock();
 	session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id));
 	if (!session) {
 		DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`",
@@ -620,14 +627,16 @@ error_unlock_session:
 	session_unlock(session);
 	session_put(session);
 error_unlock_list:
+	rcu_read_unlock();
 	session_unlock_list();
 end:
 	return ret;
 }
 
-static int action_executor_list_handler(struct action_executor *executor,
-		const struct action_work_item *work_item,
-		struct action_work_subitem *item)
+static int action_executor_list_handler(
+		struct action_executor *executor __attribute__((unused)),
+		const struct action_work_item *work_item __attribute__((unused)),
+		struct action_work_subitem *item __attribute__((unused)))
 {
 	ERR("Execution of a list action by the action executor should never occur");
 	abort();
@@ -812,7 +821,7 @@ static void clean_up_action_executor_thread(void *_data)
 struct action_executor *action_executor_create(
 		struct notification_thread_handle *handle)
 {
-	struct action_executor *executor = (action_executor *) zmalloc(sizeof(*executor));
+	struct action_executor *executor = zmalloc<action_executor>();
 
 	if (!executor) {
 		goto end;
@@ -872,6 +881,7 @@ enum action_executor_status action_executor_enqueue_trigger(
 	bool signal = false;
 
 	LTTNG_ASSERT(trigger);
+	ASSERT_RCU_READ_LOCKED();
 
 	pthread_mutex_lock(&executor->work.lock);
 	/* Check for queue overflow. */
@@ -883,7 +893,7 @@ enum action_executor_status action_executor_enqueue_trigger(
 		goto error_unlock;
 	}
 
-	work_item = (action_work_item *) zmalloc(sizeof(*work_item));
+	work_item = zmalloc<action_work_item>();
 	if (!work_item) {
 		PERROR("Failed to allocate action executor work item: trigger name = `%s`",
 				get_trigger_name(trigger));