X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fnotification-thread-events.c;h=1388b3ce34a0f743e3475af910e692502a4592ab;hb=90c106c686bee2d1dedf1496140f9291d3b16799;hp=9e5ec509135bd6d2818b6d6635ea6cdd0acf82ea;hpb=8ec89801730aef6c4af48c45938380e7dec71d59;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 9e5ec5091..1388b3ce3 100644
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -2153,6 +2153,12 @@ int remove_tracer_event_source_from_pollset(
 
 	source_element->is_fd_in_poll_set = false;
 
+	/*
+	 * Force the notification thread to restart the poll() loop to ensure
+	 * that any events from the removed fd are removed.
+	 */
+	state->restart_poll = true;
+
 	ret = drain_event_notifier_notification_pipe(state, source_element->fd,
 			source_element->domain);
 	if (ret) {
@@ -4421,7 +4427,8 @@ int notification_client_list_send_evaluation(
 			 * Notifications resulting from an hidden trigger are
 			 * only sent to the session daemon.
 			 */
-			continue;
+			DBG("Skipping client as the trigger is hidden and the client is not the session daemon");
+			goto skip_client;
 		}
 
 		if (source_object_creds) {