X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.cpp;h=e2eeed45115cfb36583a9615fa9bd3ba767ce187;hb=f46376a14da2eb796690cb4e718e8b213839d6ea;hp=68c9c71cfed5fdebbeb54eb0c400ac02fa84f7c7;hpb=48b7cdc221a445188d6d9bd08fc1686837e71224;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/action-executor.cpp b/src/bin/lttng-sessiond/action-executor.cpp
index 68c9c71cf..e2eeed451 100644
--- a/src/bin/lttng-sessiond/action-executor.cpp
+++ b/src/bin/lttng-sessiond/action-executor.cpp
@@ -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();