X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=5cccc008efbc409fb3797590aaae22bcf6c1c823;hb=72365501d3148ca977a09bad8de0ec51b427bdd8;hp=ec4d56bce7d9ec78c6c6926e256e376f59b6297a;hpb=9c374932629a1c25927dad13fce02ba1c4892cf7;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index ec4d56bce..5cccc008e 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -353,6 +353,8 @@ const char *notification_command_type_str(
 		return "REMOVE_TRACER_EVENT_SOURCE";
 	case NOTIFICATION_COMMAND_TYPE_LIST_TRIGGERS:
 		return "LIST_TRIGGERS";
+	case NOTIFICATION_COMMAND_TYPE_GET_TRIGGER:
+		return "GET_TRIGGER";
 	case NOTIFICATION_COMMAND_TYPE_QUIT:
 		return "QUIT";
 	case NOTIFICATION_COMMAND_TYPE_CLIENT_COMMUNICATION_UPDATE:
@@ -1951,9 +1953,9 @@ int handle_notification_thread_command_session_rotation(
 		 * Ownership of `evaluation` transferred to the action executor
 		 * no matter the result.
 		 */
-		executor_status = action_executor_enqueue(state->executor,
-				trigger, evaluation, &session_creds,
-				client_list);
+		executor_status = action_executor_enqueue_trigger(
+				state->executor, trigger, evaluation,
+				&session_creds, client_list);
 		evaluation = NULL;
 		switch (executor_status) {
 		case ACTION_EXECUTOR_STATUS_OK:
@@ -2280,6 +2282,69 @@ end:
 	return ret;
 }
 
+static inline void get_trigger_info_for_log(const struct lttng_trigger *trigger,
+		const char **trigger_name,
+		uid_t *trigger_owner_uid)
+{
+	enum lttng_trigger_status trigger_status;
+
+	trigger_status = lttng_trigger_get_name(trigger, trigger_name);
+	switch (trigger_status) {
+	case LTTNG_TRIGGER_STATUS_OK:
+		break;
+	case LTTNG_TRIGGER_STATUS_UNSET:
+		*trigger_name = "(unset)";
+		break;
+	default:
+		abort();
+	}
+
+	trigger_status = lttng_trigger_get_owner_uid(trigger,
+			trigger_owner_uid);
+	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+}
+
+static int handle_notification_thread_command_get_trigger(
+		struct notification_thread_state *state,
+		const struct lttng_trigger *trigger,
+		struct lttng_trigger **registered_trigger,
+		enum lttng_error_code *_cmd_result)
+{
+	int ret = -1;
+	struct cds_lfht_iter iter;
+	struct lttng_trigger_ht_element *trigger_ht_element;
+	enum lttng_error_code cmd_result = LTTNG_ERR_TRIGGER_NOT_FOUND;
+	const char *trigger_name;
+	uid_t trigger_owner_uid;
+
+	rcu_read_lock();
+
+	cds_lfht_for_each_entry(
+			state->triggers_ht, &iter, trigger_ht_element, node) {
+		if (lttng_trigger_is_equal(
+				    trigger, trigger_ht_element->trigger)) {
+			/* Take one reference on the return trigger. */
+			*registered_trigger = trigger_ht_element->trigger;
+			lttng_trigger_get(*registered_trigger);
+			ret = 0;
+			cmd_result = LTTNG_OK;
+			goto end;
+		}
+	}
+
+	/* Not a fatal error if the trigger is not found. */
+	get_trigger_info_for_log(trigger, &trigger_name, &trigger_owner_uid);
+	ERR("Failed to retrieve registered version of trigger: trigger name = '%s', trigger owner uid = %d",
+			trigger_name, (int) trigger_owner_uid);
+
+	ret = 0;
+
+end:
+	rcu_read_unlock();
+	*_cmd_result = cmd_result;
+	return ret;
+}
+
 static
 bool condition_is_supported(struct lttng_condition *condition)
 {
@@ -2852,8 +2917,8 @@ int handle_notification_thread_command_register_trigger(
 	 * Ownership of `evaluation` transferred to the action executor
 	 * no matter the result.
 	 */
-	executor_status = action_executor_enqueue(state->executor, trigger,
-			evaluation, &object_creds, client_list);
+	executor_status = action_executor_enqueue_trigger(state->executor,
+			trigger, evaluation, &object_creds, client_list);
 	evaluation = NULL;
 	switch (executor_status) {
 	case ACTION_EXECUTOR_STATUS_OK:
@@ -2984,9 +3049,6 @@ int handle_notification_thread_command_unregister_trigger(
 	trigger_ht_element = caa_container_of(triggers_ht_node,
 			struct lttng_trigger_ht_element, node);
 
-	/* From this point, consider the trigger unregistered no matter what. */
-	lttng_trigger_set_as_unregistered(trigger_ht_element->trigger);
-
 	/* Remove trigger from channel_triggers_ht. */
 	cds_lfht_for_each_entry(state->channel_triggers_ht, &iter, trigger_list,
 			channel_triggers_ht_node) {
@@ -3138,6 +3200,16 @@ int handle_notification_thread_command(
 		cmd->reply_code = LTTNG_OK;
 		ret = 1;
 		goto end;
+	case NOTIFICATION_COMMAND_TYPE_GET_TRIGGER:
+	{
+		struct lttng_trigger *trigger = NULL;
+
+		ret = handle_notification_thread_command_get_trigger(state,
+				cmd->parameters.get_trigger.trigger, &trigger,
+				&cmd->reply_code);
+		cmd->reply.get_trigger.trigger = trigger;
+		break;
+	}
 	case NOTIFICATION_COMMAND_TYPE_CLIENT_COMMUNICATION_UPDATE:
 	{
 		const enum client_transmission_status client_status =
@@ -4566,7 +4638,7 @@ int dispatch_one_event_notifier_notification(struct notification_thread_state *s
 	}
 	client_list = get_client_list_from_condition(state,
 			lttng_trigger_get_const_condition(element->trigger));
-	executor_status = action_executor_enqueue(state->executor,
+	executor_status = action_executor_enqueue_trigger(state->executor,
 			element->trigger, evaluation, NULL, client_list);
 	switch (executor_status) {
 	case ACTION_EXECUTOR_STATUS_OK:
@@ -4849,9 +4921,9 @@ int handle_notification_thread_channel_sample(
 		 * Ownership of `evaluation` transferred to the action executor
 		 * no matter the result.
 		 */
-		executor_status = action_executor_enqueue(state->executor,
-				trigger, evaluation, &channel_creds,
-				client_list);
+		executor_status = action_executor_enqueue_trigger(
+				state->executor, trigger, evaluation,
+				&channel_creds, client_list);
 		evaluation = NULL;
 		switch (executor_status) {
 		case ACTION_EXECUTOR_STATUS_OK: