X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=29318432f842b2f26193388aa563da350ed8ae04;hb=e45dd625d3e802d8e6e2ec3de180c73546e8f9fe;hp=59b10e9db718f82c791abbddd4f8d1e4a8d20ded;hpb=52d55cf94968516273d6c67f2db428908def55ac;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 59b10e9db..29318432f 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -1089,6 +1089,7 @@ int notification_thread_client_subscribe(struct notification_client *client,
 	struct notification_client_list *client_list = NULL;
 	struct lttng_condition_list_element *condition_list_element = NULL;
 	struct notification_client_list_element *client_list_element = NULL;
+	struct lttng_trigger_ht_element *trigger_ht_element;
 	enum lttng_notification_channel_status status =
 			LTTNG_NOTIFICATION_CHANNEL_STATUS_OK;
 
@@ -1138,11 +1139,11 @@ int notification_thread_client_subscribe(struct notification_client *client,
 	 * at this point so that conditions that are already TRUE result
 	 * in a notification being sent out.
 	 *
-	 * The client_list's trigger is used without locking the list itself.
-	 * This is correct since the list doesn't own the trigger and the
-	 * object is immutable.
+	 * Note the iteration on all triggers which share an identical
+	 * `condition` than the one to which the client is registering. This is
+	 * done to ensure that the client receives a distinct notification for
+	 * all triggers that have a `notify` action that have this condition.
 	 */
-	struct lttng_trigger_ht_element *trigger_ht_element;
 	pthread_mutex_lock(&client_list->lock);
 	cds_list_for_each_entry(trigger_ht_element,
 			&client_list->triggers_list, client_list_trigger_node) {
@@ -1151,6 +1152,7 @@ int notification_thread_client_subscribe(struct notification_client *client,
 			WARN("[notification-thread] Evaluation of a condition on client subscription failed, aborting.");
 			ret = -1;
 			free(client_list_element);
+			pthread_mutex_unlock(&client_list->lock);
 			goto end;
 		}
 	}
@@ -4333,7 +4335,7 @@ int notification_client_list_send_evaluation(
 			}
 		}
 
-		if (client->uid != lttng_credentials_get_uid(trigger_creds) && client->gid != lttng_credentials_get_gid(trigger_creds)) {
+		if (client->uid != lttng_credentials_get_uid(trigger_creds)) {
 			DBG("[notification-thread] Skipping client at it does not have the permission to receive notification for this trigger");
 			goto skip_client;
 		}
@@ -4521,13 +4523,6 @@ int dispatch_one_event_notifier_notification(struct notification_thread_state *s
 			struct notification_trigger_tokens_ht_element,
 			node);
 
-	if (!lttng_trigger_should_fire(element->trigger)) {
-		ret = 0;
-		goto end_unlock;
-	}
-
-	lttng_trigger_fire(element->trigger);
-
 	trigger_status = lttng_trigger_get_name(element->trigger, &trigger_name);
 	assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
 
@@ -4550,7 +4545,6 @@ int dispatch_one_event_notifier_notification(struct notification_thread_state *s
 						     element->trigger),
 					struct lttng_condition_on_event,
 					parent),
-			trigger_name,
 			notification->capture_buffer,
 			notification->capture_buf_size, false);
 
@@ -4840,12 +4834,6 @@ int handle_notification_thread_channel_sample(
 			goto put_list;
 		}
 
-		if (!lttng_trigger_should_fire(trigger)) {
-			goto put_list;
-		}
-
-		lttng_trigger_fire(trigger);
-
 		/*
 		 * Ownership of `evaluation` transferred to the action executor
 		 * no matter the result.