Change "event rule hit" to "event-rule matches" in user interface strings
[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread-events.c
index 212746faa1c7a50d67e3006f868908222a00d22c..c7037a482bfcdeccf70e0159089467196b690a79 100644 (file)
 #include <common/macros.h>
 #include <lttng/condition/condition.h>
 #include <lttng/action/action-internal.h>
+#include <lttng/action/list-internal.h>
+#include <lttng/domain-internal.h>
 #include <lttng/notification/notification-internal.h>
 #include <lttng/condition/condition-internal.h>
 #include <lttng/condition/buffer-usage-internal.h>
 #include <lttng/condition/session-consumed-size-internal.h>
 #include <lttng/condition/session-rotation-internal.h>
-#include <lttng/condition/event-rule-internal.h>
+#include <lttng/condition/event-rule-matches-internal.h>
 #include <lttng/domain-internal.h>
 #include <lttng/notification/channel-internal.h>
 #include <lttng/trigger/trigger-internal.h>
@@ -39,6 +41,7 @@
 #include <fcntl.h>
 
 #include "condition-internal.h"
+#include "event-notifier-error-accounting.h"
 #include "notification-thread.h"
 #include "notification-thread-events.h"
 #include "notification-thread-commands.h"
@@ -48,6 +51,9 @@
 #define CLIENT_POLL_MASK_IN (LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP)
 #define CLIENT_POLL_MASK_IN_OUT (CLIENT_POLL_MASK_IN | LPOLLOUT)
 
+/* The tracers currently limit the capture size to PIPE_BUF (4kb on linux). */
+#define MAX_CAPTURE_SIZE (PIPE_BUF)
+
 enum lttng_object_type {
        LTTNG_OBJECT_TYPE_UNKNOWN,
        LTTNG_OBJECT_TYPE_NONE,
@@ -116,6 +122,7 @@ struct lttng_trigger_ht_element {
        struct lttng_trigger *trigger;
        struct cds_lfht_node node;
        struct cds_lfht_node node_by_name_uid;
+       struct cds_list_head client_list_trigger_node;
        /* call_rcu delayed reclaim. */
        struct rcu_head rcu_node;
 };
@@ -193,6 +200,11 @@ int client_handle_transmission_status(
                enum client_transmission_status transmission_status,
                struct notification_thread_state *state);
 
+static
+int handle_one_event_notifier_notification(
+               struct notification_thread_state *state,
+               int pipe, enum lttng_domain_type domain);
+
 static
 void free_lttng_trigger_ht_element_rcu(struct rcu_head *node);
 
@@ -303,7 +315,7 @@ int match_client_list_condition(struct cds_lfht_node *node, const void *key)
 
        client_list = caa_container_of(node, struct notification_client_list,
                        notification_trigger_clients_ht_node);
-       condition = lttng_trigger_get_const_condition(client_list->trigger);
+       condition = client_list->condition;
 
        return !!lttng_condition_is_equal(condition_key, condition);
 }
@@ -318,6 +330,40 @@ int match_session(struct cds_lfht_node *node, const void *key)
        return !strcmp(session_info->name, name);
 }
 
+static
+const char *notification_command_type_str(
+               enum notification_thread_command_type type)
+{
+       switch (type) {
+       case NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER:
+               return "REGISTER_TRIGGER";
+       case NOTIFICATION_COMMAND_TYPE_UNREGISTER_TRIGGER:
+               return "UNREGISTER_TRIGGER";
+       case NOTIFICATION_COMMAND_TYPE_ADD_CHANNEL:
+               return "ADD_CHANNEL";
+       case NOTIFICATION_COMMAND_TYPE_REMOVE_CHANNEL:
+               return "REMOVE_CHANNEL";
+       case NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_ONGOING:
+               return "SESSION_ROTATION_ONGOING";
+       case NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_COMPLETED:
+               return "SESSION_ROTATION_COMPLETED";
+       case NOTIFICATION_COMMAND_TYPE_ADD_TRACER_EVENT_SOURCE:
+               return "ADD_TRACER_EVENT_SOURCE";
+       case NOTIFICATION_COMMAND_TYPE_REMOVE_TRACER_EVENT_SOURCE:
+               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:
+               return "CLIENT_COMMUNICATION_UPDATE";
+       default:
+               abort();
+       }
+}
+
 /*
  * Match trigger based on name and credentials only.
  * Name duplication is NOT allowed for the same uid.
@@ -327,7 +373,7 @@ int match_trigger_by_name_uid(struct cds_lfht_node *node,
                const void *key)
 {
        bool match = false;
-       const char *name;
+       const char *element_trigger_name;
        const char *key_name;
        enum lttng_trigger_status status;
        const struct lttng_credentials *key_creds;
@@ -339,14 +385,25 @@ int match_trigger_by_name_uid(struct cds_lfht_node *node,
                                struct lttng_trigger_ht_element,
                                node_by_name_uid);
 
-       status = lttng_trigger_get_name(trigger_ht_element->trigger, &name);
-       assert(status == LTTNG_TRIGGER_STATUS_OK);
+       status = lttng_trigger_get_name(trigger_ht_element->trigger,
+                       &element_trigger_name);
+       element_trigger_name = status == LTTNG_TRIGGER_STATUS_OK ?
+                       element_trigger_name : NULL;
 
        status = lttng_trigger_get_name(trigger_key, &key_name);
-       assert(status == LTTNG_TRIGGER_STATUS_OK);
+       key_name = status == LTTNG_TRIGGER_STATUS_OK ? key_name : NULL;
+
+       /*
+        * Compare the names.
+        * Consider null names as not equal. This is to maintain backwards
+        * compatibility with pre-2.13 anonymous triggers. Multiples anonymous
+        * triggers are allowed for a given user.
+        */
+       if (!element_trigger_name || !key_name) {
+               goto end;
+       }
 
-       /* Compare the names. */
-       if (strcmp(name, key_name) != 0) {
+       if (strcmp(element_trigger_name, key_name) != 0) {
                goto end;
        }
 
@@ -425,7 +482,7 @@ enum lttng_object_type get_condition_binding_object(
        case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
        case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
                return LTTNG_OBJECT_TYPE_SESSION;
-       case LTTNG_CONDITION_TYPE_EVENT_RULE_HIT:
+       case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
                return LTTNG_OBJECT_TYPE_NONE;
        default:
                return LTTNG_OBJECT_TYPE_UNKNOWN;
@@ -473,7 +530,7 @@ void session_info_destroy(void *_data)
        if (session_info->channel_infos_ht) {
                ret = cds_lfht_destroy(session_info->channel_infos_ht, NULL);
                if (ret) {
-                       ERR("[notification-thread] Failed to destroy channel information hash table");
+                       ERR("Failed to destroy channel information hash table");
                }
        }
        lttng_session_trigger_list_destroy(session_info->trigger_list);
@@ -618,62 +675,121 @@ void notification_client_list_release(struct urcu_ref *list_ref)
                        container_of(list_ref, typeof(*list), ref);
        struct notification_client_list_element *client_list_element, *tmp;
 
+       lttng_condition_put(list->condition);
+
        if (list->notification_trigger_clients_ht) {
                rcu_read_lock();
+
                cds_lfht_del(list->notification_trigger_clients_ht,
                                &list->notification_trigger_clients_ht_node);
                rcu_read_unlock();
                list->notification_trigger_clients_ht = NULL;
        }
        cds_list_for_each_entry_safe(client_list_element, tmp,
-                                    &list->list, node) {
+                                    &list->clients_list, node) {
                free(client_list_element);
        }
+
+       assert(cds_list_empty(&list->triggers_list));
+
        pthread_mutex_destroy(&list->lock);
        call_rcu(&list->rcu_node, free_notification_client_list_rcu);
 }
 
+static
+bool condition_applies_to_client(const struct lttng_condition *condition,
+               struct notification_client *client)
+{
+       bool applies = false;
+       struct lttng_condition_list_element *condition_list_element;
+
+       cds_list_for_each_entry(condition_list_element, &client->condition_list,
+                       node) {
+               applies = lttng_condition_is_equal(
+                               condition_list_element->condition,
+                               condition);
+               if (applies) {
+                       break;
+               }
+       }
+
+       return applies;
+}
+
 static
 struct notification_client_list *notification_client_list_create(
-               const struct lttng_trigger *trigger)
+               struct notification_thread_state *state,
+               const struct lttng_condition *condition)
 {
-       struct notification_client_list *client_list =
-                       zmalloc(sizeof(*client_list));
+       struct notification_client *client;
+       struct cds_lfht_iter iter;
+       struct notification_client_list *client_list;
 
+       client_list = zmalloc(sizeof(*client_list));
        if (!client_list) {
-               goto error;
+               PERROR("Failed to allocate notification client list");
+               goto end;
        }
+
        pthread_mutex_init(&client_list->lock, NULL);
+       /*
+        * The trigger that owns the condition has the first reference to this
+        * client list.
+        */
        urcu_ref_init(&client_list->ref);
        cds_lfht_node_init(&client_list->notification_trigger_clients_ht_node);
-       CDS_INIT_LIST_HEAD(&client_list->list);
-       client_list->trigger = trigger;
-error:
-       return client_list;
-}
+       CDS_INIT_LIST_HEAD(&client_list->clients_list);
+       CDS_INIT_LIST_HEAD(&client_list->triggers_list);
 
-static
-void publish_notification_client_list(
-               struct notification_thread_state *state,
-               struct notification_client_list *list)
-{
-       const struct lttng_condition *condition =
-                       lttng_trigger_get_const_condition(list->trigger);
+       /*
+        * Create a copy of the condition so that it's independent of any
+        * trigger. The client list may outlive the trigger object (which owns
+        * the condition) that is used to create it.
+        */
+       client_list->condition = lttng_condition_copy(condition);
+
+       /* Build a list of clients to which this new condition applies. */
+       cds_lfht_for_each_entry (state->client_socket_ht, &iter, client,
+                       client_socket_ht_node) {
+               struct notification_client_list_element *client_list_element;
 
-       assert(!list->notification_trigger_clients_ht);
-       notification_client_list_get(list);
+               if (!condition_applies_to_client(condition, client)) {
+                       continue;
+               }
+
+               client_list_element = zmalloc(sizeof(*client_list_element));
+               if (!client_list_element) {
+                       goto error_put_client_list;
+               }
+
+               CDS_INIT_LIST_HEAD(&client_list_element->node);
+               client_list_element->client = client;
+               cds_list_add(&client_list_element->node, &client_list->clients_list);
+       }
 
-       list->notification_trigger_clients_ht =
+       client_list->notification_trigger_clients_ht =
                        state->notification_trigger_clients_ht;
 
        rcu_read_lock();
-       cds_lfht_add(state->notification_trigger_clients_ht,
-                       lttng_condition_hash(condition),
-                       &list->notification_trigger_clients_ht_node);
+       /*
+        * Add the client list to the global list of client list.
+        */
+       cds_lfht_add_unique(state->notification_trigger_clients_ht,
+                       lttng_condition_hash(client_list->condition),
+                       match_client_list_condition,
+                       client_list->condition,
+                       &client_list->notification_trigger_clients_ht_node);
        rcu_read_unlock();
+       goto end;
+
+error_put_client_list:
+       notification_client_list_put(client_list);
+       client_list = NULL;
+
+end:
+       return client_list;
 }
 
-LTTNG_HIDDEN
 void notification_client_list_put(struct notification_client_list *list)
 {
        if (!list) {
@@ -754,7 +870,7 @@ int evaluate_channel_condition_for_client(
 
        if (!channel_key){
                /* No channel found; normal exit. */
-               DBG("[notification-thread] No known channel associated with newly subscribed-to condition");
+               DBG("No known channel associated with newly subscribed-to condition");
                ret = 0;
                goto end;
        }
@@ -783,7 +899,7 @@ int evaluate_channel_condition_for_client(
                                channel_state_ht_node);
        } else {
                /* Nothing to evaluate, no sample was ever taken. Normal exit */
-               DBG("[notification-thread] No channel sample associated with newly subscribed-to condition");
+               DBG("No channel sample associated with newly subscribed-to condition");
                ret = 0;
                goto end;
        }
@@ -793,7 +909,7 @@ int evaluate_channel_condition_for_client(
                        0, channel_info->session_info->consumed_data_size,
                        channel_info);
        if (ret) {
-               WARN("[notification-thread] Fatal error occurred while evaluating a newly subscribed-to condition");
+               WARN("Fatal error occurred while evaluating a newly subscribed-to condition");
                goto end;
        }
 
@@ -829,7 +945,7 @@ const char *get_condition_session_name(const struct lttng_condition *condition)
                abort();
        }
        if (status != LTTNG_CONDITION_STATUS_OK) {
-               ERR("[notification-thread] Failed to retrieve session rotation condition's session name");
+               ERR("Failed to retrieve session rotation condition's session name");
                goto end;
        }
 end:
@@ -860,7 +976,7 @@ int evaluate_session_condition_for_client(
                        &iter);
        node = cds_lfht_iter_get_node(&iter);
        if (!node) {
-               DBG("[notification-thread] No known session matching name \"%s\"",
+               DBG("No known session matching name \"%s\"",
                                session_name);
                ret = 0;
                goto end;
@@ -885,7 +1001,7 @@ int evaluate_session_condition_for_client(
                                session_info->rotation.id);
                if (!*evaluation) {
                        /* Fatal error. */
-                       ERR("[notification-thread] Failed to create session rotation ongoing evaluation for session \"%s\"",
+                       ERR("Failed to create session rotation ongoing evaluation for session \"%s\"",
                                        session_info->name);
                        ret = -1;
                        goto end_session_put;
@@ -937,7 +1053,7 @@ int evaluate_condition_for_client(const struct lttng_trigger *trigger,
                                &evaluation, &object_uid, &object_gid);
                break;
        case LTTNG_OBJECT_TYPE_NONE:
-               DBG("[notification-thread] Newly subscribed-to condition not bound to object, nothing to evaluate");
+               DBG("Newly subscribed-to condition not bound to object, nothing to evaluate");
                ret = 0;
                goto end;
        case LTTNG_OBJECT_TYPE_UNKNOWN:
@@ -951,7 +1067,7 @@ int evaluate_condition_for_client(const struct lttng_trigger *trigger,
        }
        if (!evaluation) {
                /* Evaluation yielded nothing. Normal exit. */
-               DBG("[notification-thread] Newly subscribed-to condition evaluated to false, nothing to report to client");
+               DBG("Newly subscribed-to condition evaluated to false, nothing to report to client");
                ret = 0;
                goto end;
        }
@@ -961,15 +1077,14 @@ int evaluate_condition_for_client(const struct lttng_trigger *trigger,
         * subscribing.
         */
        cds_lfht_node_init(&client_list.notification_trigger_clients_ht_node);
-       CDS_INIT_LIST_HEAD(&client_list.list);
-       client_list.trigger = trigger;
+       CDS_INIT_LIST_HEAD(&client_list.clients_list);
 
        CDS_INIT_LIST_HEAD(&client_list_element.node);
        client_list_element.client = client;
-       cds_list_add(&client_list_element.node, &client_list.list);
+       cds_list_add(&client_list_element.node, &client_list.clients_list);
 
        /* Send evaluation result to the newly-subscribed client. */
-       DBG("[notification-thread] Newly subscribed-to condition evaluated to true, notifying client");
+       DBG("Newly subscribed-to condition evaluated to true, notifying client");
        ret = send_evaluation_to_clients(trigger, evaluation, &client_list,
                        state, object_uid, object_gid);
 
@@ -987,6 +1102,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;
 
@@ -1018,9 +1134,11 @@ int notification_thread_client_subscribe(struct notification_client *client,
         */
        CDS_INIT_LIST_HEAD(&condition_list_element->node);
        condition_list_element->condition = condition;
+       condition = NULL;
        cds_list_add(&condition_list_element->node, &client->condition_list);
 
-       client_list = get_client_list_from_condition(state, condition);
+       client_list = get_client_list_from_condition(
+                       state, condition_list_element->condition);
        if (!client_list) {
                /*
                 * No notification-emiting trigger registered with this
@@ -1036,17 +1154,24 @@ 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.
         */
-       if (evaluate_condition_for_client(client_list->trigger, condition,
-                       client, state)) {
-               WARN("[notification-thread] Evaluation of a condition on client subscription failed, aborting.");
-               ret = -1;
-               free(client_list_element);
-               goto end;
+       pthread_mutex_lock(&client_list->lock);
+       cds_list_for_each_entry(trigger_ht_element,
+                       &client_list->triggers_list, client_list_trigger_node) {
+               if (evaluate_condition_for_client(trigger_ht_element->trigger, condition_list_element->condition,
+                               client, state)) {
+                       WARN("Evaluation of a condition on client subscription failed, aborting.");
+                       ret = -1;
+                       free(client_list_element);
+                       pthread_mutex_unlock(&client_list->lock);
+                       goto end;
+               }
        }
+       pthread_mutex_unlock(&client_list->lock);
 
        /*
         * Add the client to the list of clients interested in a given trigger
@@ -1057,7 +1182,7 @@ int notification_thread_client_subscribe(struct notification_client *client,
        CDS_INIT_LIST_HEAD(&client_list_element->node);
 
        pthread_mutex_lock(&client_list->lock);
-       cds_list_add(&client_list_element->node, &client_list->list);
+       cds_list_add(&client_list_element->node, &client_list->clients_list);
        pthread_mutex_unlock(&client_list->lock);
 end:
        if (_status) {
@@ -1066,10 +1191,12 @@ end:
        if (client_list) {
                notification_client_list_put(client_list);
        }
+       lttng_condition_destroy(condition);
        return ret;
 error:
        free(condition_list_element);
        free(client_list_element);
+       lttng_condition_destroy(condition);
        return ret;
 }
 
@@ -1128,7 +1255,7 @@ int notification_thread_client_unsubscribe(
 
        pthread_mutex_lock(&client_list->lock);
        cds_list_for_each_entry_safe(client_list_element, client_tmp,
-                       &client_list->list, node) {
+                       &client_list->clients_list, node) {
                if (client_list_element->client->id != client->id) {
                        continue;
                }
@@ -1321,25 +1448,6 @@ fail:
        return false;
 }
 
-static
-bool trigger_applies_to_client(struct lttng_trigger *trigger,
-               struct notification_client *client)
-{
-       bool applies = false;
-       struct lttng_condition_list_element *condition_list_element;
-
-       cds_list_for_each_entry(condition_list_element, &client->condition_list,
-                       node) {
-               applies = lttng_condition_is_equal(
-                               condition_list_element->condition,
-                               lttng_trigger_get_condition(trigger));
-               if (applies) {
-                       break;
-               }
-       }
-       return applies;
-}
-
 /* Must be called with RCU read lock held. */
 static
 struct lttng_session_trigger_list *get_session_trigger_list(
@@ -1361,7 +1469,7 @@ struct lttng_session_trigger_list *get_session_trigger_list(
                 * Not an error, the list of triggers applying to that session
                 * will be initialized when the session is created.
                 */
-               DBG("[notification-thread] No trigger list found for session \"%s\" as it is not yet known to the notification system",
+               DBG("No trigger list found for session \"%s\" as it is not yet known to the notification system",
                                session_name);
                goto end;
        }
@@ -1470,7 +1578,7 @@ bool trigger_applies_to_session(const struct lttng_trigger *trigger,
                condition_status = lttng_condition_session_rotation_get_session_name(
                        condition, &condition_session_name);
                if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-                       ERR("[notification-thread] Failed to retrieve session rotation condition's session name");
+                       ERR("Failed to retrieve session rotation condition's session name");
                        goto end;
                }
 
@@ -1525,7 +1633,7 @@ struct lttng_session_trigger_list *lttng_session_trigger_list_build(
                trigger_count++;
        }
 
-       DBG("[notification-thread] Found %i triggers that apply to newly created session",
+       DBG("Found %i triggers that apply to newly created session",
                        trigger_count);
        return session_trigger_list;
 error:
@@ -1551,7 +1659,7 @@ struct session_info *find_or_create_session_info(
                        &iter);
        node = cds_lfht_iter_get_node(&iter);
        if (node) {
-               DBG("[notification-thread] Found session info of session \"%s\" (uid = %i, gid = %i)",
+               DBG("Found session info of session \"%s\" (uid = %i, gid = %i)",
                                name, uid, gid);
                session = caa_container_of(node, struct session_info,
                                sessions_ht_node);
@@ -1569,7 +1677,7 @@ struct session_info *find_or_create_session_info(
        session = session_info_create(name, uid, gid, trigger_list,
                        state->sessions_ht);
        if (!session) {
-               ERR("[notification-thread] Failed to allocation session info for session \"%s\" (uid = %i, gid = %i)",
+               ERR("Failed to allocation session info for session \"%s\" (uid = %i, gid = %i)",
                                name, uid, gid);
                lttng_session_trigger_list_destroy(trigger_list);
                goto error;
@@ -1607,9 +1715,9 @@ int handle_notification_thread_command_add_channel(
        struct cds_lfht_iter iter;
        struct session_info *session_info = NULL;
 
-       DBG("[notification-thread] Adding channel %s from session %s, channel key = %" PRIu64 " in %s domain",
+       DBG("Adding channel %s from session %s, channel key = %" PRIu64 " in %s domain",
                        channel_name, session_name, channel_key_int,
-                       channel_domain == LTTNG_DOMAIN_KERNEL ? "kernel" : "user space");
+                       lttng_domain_type_str(channel_domain));
 
        CDS_INIT_LIST_HEAD(&trigger_list);
 
@@ -1649,7 +1757,7 @@ int handle_notification_thread_command_add_channel(
        }
        rcu_read_unlock();
 
-       DBG("[notification-thread] Found %i triggers that apply to newly added channel",
+       DBG("Found %i triggers that apply to newly added channel",
                        trigger_count);
        channel_trigger_list = zmalloc(sizeof(*channel_trigger_list));
        if (!channel_trigger_list) {
@@ -1709,8 +1817,8 @@ int handle_notification_thread_command_remove_channel(
        struct channel_key key = { .key = channel_key, .domain = domain };
        struct channel_info *channel_info;
 
-       DBG("[notification-thread] Removing channel key = %" PRIu64 " in %s domain",
-                       channel_key, domain == LTTNG_DOMAIN_KERNEL ? "kernel" : "user space");
+       DBG("Removing channel key = %" PRIu64 " in %s domain",
+                       channel_key, lttng_domain_type_str(domain));
 
        rcu_read_lock();
 
@@ -1725,7 +1833,7 @@ int handle_notification_thread_command_remove_channel(
         * channel that doesn't exist.
         */
        if (!node) {
-               ERR("[notification-thread] Channel being removed is unknown to the notification thread");
+               ERR("Channel being removed is unknown to the notification thread");
                goto end;
        }
 
@@ -1813,7 +1921,7 @@ int handle_notification_thread_command_session_rotation(
        session_info->rotation.id = trace_archive_chunk_id;
        trigger_list = get_session_trigger_list(state, session_name);
        if (!trigger_list) {
-               DBG("[notification-thread] No triggers applying to session \"%s\" found",
+               DBG("No triggers applying to session \"%s\" found",
                                session_name);
                goto end;
        }
@@ -1860,9 +1968,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:
@@ -1926,14 +2034,14 @@ int handle_notification_thread_command_add_tracer_event_source(
 
        cds_list_add(&element->node, &state->tracer_event_sources_list);
 
-       DBG3("[notification-thread] Adding tracer event source fd to poll set: tracer_event_source_fd = %d, domain = '%s'",
+       DBG3("Adding tracer event source fd to poll set: tracer_event_source_fd = %d, domain = '%s'",
                        tracer_event_source_fd,
                        lttng_domain_type_str(domain_type));
 
        /* Adding the read side pipe to the event poll. */
        ret = lttng_poll_add(&state->events, tracer_event_source_fd, LPOLLIN | LPOLLERR);
        if (ret < 0) {
-               ERR("[notification-thread] Failed to add tracer event source to poll set: tracer_event_source_fd = %d, domain = '%s'",
+               ERR("Failed to add tracer event source to poll set: tracer_event_source_fd = %d, domain = '%s'",
                                tracer_event_source_fd,
                                lttng_domain_type_str(element->domain));
                cds_list_del(&element->node);
@@ -1948,6 +2056,59 @@ end:
        return ret;
 }
 
+static
+int drain_event_notifier_notification_pipe(
+               struct notification_thread_state *state,
+               int pipe, enum lttng_domain_type domain)
+{
+       struct lttng_poll_event events = {0};
+       int ret;
+
+       ret = lttng_poll_create(&events, 1, LTTNG_CLOEXEC);
+       if (ret < 0) {
+               ERR("Error creating lttng_poll_event");
+               goto end;
+       }
+
+       ret = lttng_poll_add(&events, pipe, LPOLLIN);
+       if (ret < 0) {
+               ERR("Error adding fd event notifier notification pipe to lttng_poll_event: fd = %d",
+                               pipe);
+               goto end;
+       }
+
+       while (true) {
+               /*
+                * Continue to consume notifications as long as there are new
+                * ones coming in. The tracer has been asked to stop producing
+                * them.
+                *
+                * LPOLLIN is explicitly checked since LPOLLHUP is implicitly
+                * monitored (on Linux, at least) and will be returned when
+                * the pipe is closed but empty.
+                */
+               ret = lttng_poll_wait_interruptible(&events, 0);
+               if (ret == 0 || (LTTNG_POLL_GETEV(&events, 0) & LPOLLIN) == 0) {
+                       /* No more notification to be read on this pipe. */
+                       ret = 0;
+                       goto end;
+               } else if (ret < 0) {
+                       PERROR("Failed on lttng_poll_wait_interruptible() call");
+                       ret = -1;
+                       goto end;
+               }
+
+               ret = handle_one_event_notifier_notification(state, pipe, domain);
+               if (ret) {
+                       ERR("Error consuming an event notifier notification from pipe: fd = %d",
+                                       pipe);
+               }
+       }
+end:
+       lttng_poll_clean(&events);
+       return ret;
+}
+
 static
 int handle_notification_thread_command_remove_tracer_event_source(
                struct notification_thread_state *state,
@@ -1965,7 +2126,7 @@ int handle_notification_thread_command_remove_tracer_event_source(
                        continue;
                }
 
-               DBG("[notification-thread] Removed tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
+               DBG("Removed tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
                                tracer_event_source_fd,
                                lttng_domain_type_str(source_element->domain));
                cds_list_del(&source_element->node);
@@ -1988,14 +2149,14 @@ int handle_notification_thread_command_remove_tracer_event_source(
                goto end;
        }
 
-       DBG3("[notification-thread] Removing tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
+       DBG3("Removing tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
                        tracer_event_source_fd,
                        lttng_domain_type_str(source_element->domain));
 
        /* Removing the fd from the event poll set. */
        ret = lttng_poll_del(&state->events, tracer_event_source_fd);
        if (ret < 0) {
-               ERR("[notification-thread] Failed to remove tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
+               ERR("Failed to remove tracer event source from poll set: tracer_event_source_fd = %d, domain = '%s'",
                                tracer_event_source_fd,
                                lttng_domain_type_str(source_element->domain));
                cmd_result = LTTNG_ERR_FATAL;
@@ -2004,6 +2165,24 @@ int handle_notification_thread_command_remove_tracer_event_source(
 
        source_element->is_fd_in_poll_set = false;
 
+       ret = drain_event_notifier_notification_pipe(state, tracer_event_source_fd,
+                       source_element->domain);
+       if (ret) {
+               ERR("Error draining event notifier notification: tracer_event_source_fd = %d, domain = %s",
+                               tracer_event_source_fd,
+                               lttng_domain_type_str(source_element->domain));
+               cmd_result = LTTNG_ERR_FATAL;
+               goto end;
+       }
+
+       /*
+        * The drain_event_notifier_notification_pipe() call might have read
+        * data from an fd that we received in event in the latest _poll_wait()
+        * call. Make sure the thread call poll_wait() again to ensure we have
+        * a clean state.
+        */
+       state->restart_poll = true;
+
 end:
        free(source_element);
        *_cmd_result = cmd_result;
@@ -2078,6 +2257,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 = "(anonymous)";
+               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);
+       DBG("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)
 {
@@ -2109,12 +2351,12 @@ bool condition_is_supported(struct lttng_condition *condition)
                is_supported = kernel_supports_ring_buffer_snapshot_sample_positions() == 1;
                break;
        }
-       case LTTNG_CONDITION_TYPE_EVENT_RULE_HIT:
+       case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
        {
                const struct lttng_event_rule *event_rule;
                enum lttng_domain_type domain;
                const enum lttng_condition_status status =
-                               lttng_condition_event_rule_get_rule(
+                               lttng_condition_event_rule_matches_get_rule(
                                                condition, &event_rule);
 
                assert(status == LTTNG_CONDITION_STATUS_OK);
@@ -2162,7 +2404,7 @@ int bind_trigger_to_matching_session(struct lttng_trigger *trigger,
                status = lttng_condition_session_rotation_get_session_name(
                                condition, &session_name);
                if (status != LTTNG_CONDITION_STATUS_OK) {
-                       ERR("[notification-thread] Failed to bind trigger to session: unable to get 'session_rotation' condition's session name");
+                       ERR("Failed to bind trigger to session: unable to get 'session_rotation' condition's session name");
                        ret = -1;
                        goto end;
                }
@@ -2175,13 +2417,13 @@ int bind_trigger_to_matching_session(struct lttng_trigger *trigger,
 
        trigger_list = get_session_trigger_list(state, session_name);
        if (!trigger_list) {
-               DBG("[notification-thread] Unable to bind trigger applying to session \"%s\" as it is not yet known to the notification system",
+               DBG("Unable to bind trigger applying to session \"%s\" as it is not yet known to the notification system",
                                session_name);
                goto end;
 
        }
 
-       DBG("[notification-thread] Newly registered trigger bound to session \"%s\"",
+       DBG("Newly registered trigger bound to session \"%s\"",
                        session_name);
        ret = lttng_session_trigger_list_add(trigger_list, trigger);
 end:
@@ -2227,7 +2469,7 @@ int bind_trigger_to_matching_channels(struct lttng_trigger *trigger,
                CDS_INIT_LIST_HEAD(&trigger_list_element->node);
                trigger_list_element->trigger = trigger;
                cds_list_add(&trigger_list_element->node, &trigger_list->list);
-               DBG("[notification-thread] Newly registered trigger bound to channel \"%s\"",
+               DBG("Newly registered trigger bound to channel \"%s\"",
                                channel->name);
        }
 end:
@@ -2249,16 +2491,16 @@ bool is_trigger_action_notify(const struct lttng_trigger *trigger)
        if (action_type == LTTNG_ACTION_TYPE_NOTIFY) {
                is_notify = true;
                goto end;
-       } else if (action_type != LTTNG_ACTION_TYPE_GROUP) {
+       } else if (action_type != LTTNG_ACTION_TYPE_LIST) {
                goto end;
        }
 
-       action_status = lttng_action_group_get_count(action, &count);
+       action_status = lttng_action_list_get_count(action, &count);
        assert(action_status == LTTNG_ACTION_STATUS_OK);
 
        for (i = 0; i < count; i++) {
                const struct lttng_action *inner_action =
-                               lttng_action_group_get_at_index(
+                               lttng_action_list_get_at_index(
                                                action, i);
 
                action_type = lttng_action_get_type(inner_action);
@@ -2316,6 +2558,79 @@ enum lttng_error_code generate_trigger_name(
        return ret_code;
 }
 
+static inline
+void notif_thread_state_remove_trigger_ht_elem(
+               struct notification_thread_state *state,
+               struct lttng_trigger_ht_element *trigger_ht_element)
+{
+       assert(state);
+       assert(trigger_ht_element);
+
+       cds_lfht_del(state->triggers_ht, &trigger_ht_element->node);
+       cds_lfht_del(state->triggers_by_name_uid_ht, &trigger_ht_element->node_by_name_uid);
+}
+
+static
+enum lttng_error_code setup_tracer_notifier(
+               struct notification_thread_state *state,
+               struct lttng_trigger *trigger)
+{
+       enum lttng_error_code ret;
+       enum event_notifier_error_accounting_status error_accounting_status;
+       struct cds_lfht_node *node;
+       uint64_t error_counter_index = 0;
+       struct lttng_condition *condition = lttng_trigger_get_condition(trigger);
+       struct notification_trigger_tokens_ht_element *trigger_tokens_ht_element = NULL;
+
+       trigger_tokens_ht_element = zmalloc(sizeof(*trigger_tokens_ht_element));
+       if (!trigger_tokens_ht_element) {
+               ret = LTTNG_ERR_NOMEM;
+               goto end;
+       }
+
+       /* Add trigger token to the trigger_tokens_ht. */
+       cds_lfht_node_init(&trigger_tokens_ht_element->node);
+       trigger_tokens_ht_element->token = LTTNG_OPTIONAL_GET(trigger->tracer_token);
+       trigger_tokens_ht_element->trigger = trigger;
+
+       node = cds_lfht_add_unique(state->trigger_tokens_ht,
+                       hash_key_u64(&trigger_tokens_ht_element->token, lttng_ht_seed),
+                       match_trigger_token,
+                       &trigger_tokens_ht_element->token,
+                       &trigger_tokens_ht_element->node);
+       if (node != &trigger_tokens_ht_element->node) {
+               ret = LTTNG_ERR_TRIGGER_EXISTS;
+               goto error_free_ht_element;
+       }
+
+       error_accounting_status = event_notifier_error_accounting_register_event_notifier(
+                       trigger, &error_counter_index);
+       if (error_accounting_status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
+               if (error_accounting_status == EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_NO_INDEX_AVAILABLE) {
+                       DBG("Trigger list error accounting counter full.");
+                       ret = LTTNG_ERR_EVENT_NOTIFIER_ERROR_ACCOUNTING_FULL;
+               } else {
+                       ERR("Error registering trigger for error accounting");
+                       ret = LTTNG_ERR_EVENT_NOTIFIER_REGISTRATION;
+               }
+
+               goto error_remove_ht_element;
+       }
+
+       lttng_condition_event_rule_matches_set_error_counter_index(
+                       condition, error_counter_index);
+
+       ret = LTTNG_OK;
+       goto end;
+
+error_remove_ht_element:
+       cds_lfht_del(state->trigger_tokens_ht, &trigger_tokens_ht_element->node);
+error_free_ht_element:
+       free(trigger_tokens_ht_element);
+end:
+       return ret;
+}
+
 /*
  * FIXME A client's credentials are not checked when registering a trigger.
  *
@@ -2335,17 +2650,14 @@ static
 int handle_notification_thread_command_register_trigger(
                struct notification_thread_state *state,
                struct lttng_trigger *trigger,
+               bool is_trigger_anonymous,
                enum lttng_error_code *cmd_result)
 {
        int ret = 0;
        struct lttng_condition *condition;
-       struct notification_client *client;
        struct notification_client_list *client_list = NULL;
        struct lttng_trigger_ht_element *trigger_ht_element = NULL;
-       struct notification_client_list_element *client_list_element;
-       struct notification_trigger_tokens_ht_element *trigger_tokens_ht_element = NULL;
        struct cds_lfht_node *node;
-       struct cds_lfht_iter iter;
        const char* trigger_name;
        bool free_trigger = true;
        struct lttng_evaluation *evaluation = NULL;
@@ -2361,22 +2673,27 @@ int handle_notification_thread_command_register_trigger(
        /* Set the trigger's tracer token. */
        lttng_trigger_set_tracer_token(trigger, trigger_tracer_token);
 
-       if (lttng_trigger_get_name(trigger, &trigger_name) ==
-                       LTTNG_TRIGGER_STATUS_UNSET) {
-               const enum lttng_error_code ret_code = generate_trigger_name(
-                               state, trigger, &trigger_name);
+       if (!is_trigger_anonymous) {
+               if (lttng_trigger_get_name(trigger, &trigger_name) ==
+                               LTTNG_TRIGGER_STATUS_UNSET) {
+                       const enum lttng_error_code ret_code =
+                                       generate_trigger_name(state, trigger,
+                                                       &trigger_name);
 
-               if (ret_code != LTTNG_OK) {
-                       /* Fatal error. */
-                       ret = -1;
-                       *cmd_result = ret_code;
+                       if (ret_code != LTTNG_OK) {
+                               /* Fatal error. */
+                               ret = -1;
+                               *cmd_result = ret_code;
+                               goto error;
+                       }
+               } else if (trigger_name_taken(state, trigger)) {
+                       /* Not a fatal error. */
+                       *cmd_result = LTTNG_ERR_TRIGGER_EXISTS;
+                       ret = 0;
                        goto error;
                }
-       } else if (trigger_name_taken(state, trigger)) {
-               /* Not a fatal error. */
-               *cmd_result = LTTNG_ERR_TRIGGER_EXISTS;
-               ret = 0;
-               goto error;
+       } else {
+               trigger_name = "(anonymous)";
        }
 
        condition = lttng_trigger_get_condition(trigger);
@@ -2416,101 +2733,80 @@ int handle_notification_thread_command_register_trigger(
                        trigger,
                        &trigger_ht_element->node_by_name_uid);
        if (node != &trigger_ht_element->node_by_name_uid) {
-               /* Not a fatal error, simply report it to the client. */
-               cds_lfht_del(state->triggers_ht, &trigger_ht_element->node);
-               *cmd_result = LTTNG_ERR_TRIGGER_EXISTS;
+               /* Internal error: add to triggers_ht should have failed. */
+               ret = -1;
                goto error_free_ht_element;
        }
 
-       if (lttng_condition_get_type(condition) == LTTNG_CONDITION_TYPE_EVENT_RULE_HIT) {
-               trigger_tokens_ht_element = zmalloc(sizeof(*trigger_tokens_ht_element));
-               if (!trigger_tokens_ht_element) {
-                       /* Fatal error. */
-                       ret = -1;
-                       cds_lfht_del(state->triggers_ht,
-                                       &trigger_ht_element->node);
-                       cds_lfht_del(state->triggers_by_name_uid_ht,
-                                       &trigger_ht_element->node_by_name_uid);
-                       goto error_free_ht_element;
-               }
+       /* From this point consider the trigger registered. */
+       lttng_trigger_set_as_registered(trigger);
+
+       /*
+        * Some triggers might need a tracer notifier depending on its
+        * condition and actions.
+        */
+       if (lttng_trigger_needs_tracer_notifier(trigger)) {
+               enum lttng_error_code error_code;
+
+               error_code = setup_tracer_notifier(state, trigger);
+               if (error_code != LTTNG_OK) {
+                       notif_thread_state_remove_trigger_ht_elem(state,
+                                       trigger_ht_element);
+                       if (error_code == LTTNG_ERR_NOMEM) {
+                               ret = -1;
+                       } else {
+                               *cmd_result = error_code;
+                               ret = 0;
+                       }
 
-               /* Add trigger token to the trigger_tokens_ht. */
-               cds_lfht_node_init(&trigger_tokens_ht_element->node);
-               trigger_tokens_ht_element->token =
-                               LTTNG_OPTIONAL_GET(trigger->tracer_token);
-               trigger_tokens_ht_element->trigger = trigger;
-
-               node = cds_lfht_add_unique(state->trigger_tokens_ht,
-                               hash_key_u64(&trigger_tokens_ht_element->token,
-                                               lttng_ht_seed),
-                               match_trigger_token,
-                               &trigger_tokens_ht_element->token,
-                               &trigger_tokens_ht_element->node);
-               if (node != &trigger_tokens_ht_element->node) {
-                       /* Internal corruption, fatal error. */
-                       ret = -1;
-                       *cmd_result = LTTNG_ERR_TRIGGER_EXISTS;
-                       cds_lfht_del(state->triggers_ht,
-                                       &trigger_ht_element->node);
-                       cds_lfht_del(state->triggers_by_name_uid_ht,
-                                       &trigger_ht_element->node_by_name_uid);
                        goto error_free_ht_element;
                }
        }
 
-       /*
-        * Ownership of the trigger and of its wrapper was transfered to
-        * the triggers_ht. Same for token ht element if necessary.
-        */
-       trigger_tokens_ht_element = NULL;
-       trigger_ht_element = NULL;
-       free_trigger = false;
-
        /*
         * The rest only applies to triggers that have a "notify" action.
         * It is not skipped as this is the only action type currently
         * supported.
         */
        if (is_trigger_action_notify(trigger)) {
-               client_list = notification_client_list_create(trigger);
+               /*
+                * Find or create the client list of this condition. It may
+                * already be present if another trigger is already registered
+                * with the same condition.
+                */
+               client_list = get_client_list_from_condition(state, condition);
                if (!client_list) {
-                       ret = -1;
-                       goto error_free_ht_element;
-               }
-
-               /* Build a list of clients to which this new trigger applies. */
-               cds_lfht_for_each_entry (state->client_socket_ht, &iter, client,
-                               client_socket_ht_node) {
-                       if (!trigger_applies_to_client(trigger, client)) {
-                               continue;
-                       }
-
-                       client_list_element =
-                                       zmalloc(sizeof(*client_list_element));
-                       if (!client_list_element) {
-                               ret = -1;
-                               goto error_put_client_list;
+                       /*
+                        * No client list for this condition yet. We create new
+                        * one and build it up.
+                        */
+                       client_list = notification_client_list_create(state, condition);
+                       if (!client_list) {
+                               ERR("Error creating notification client list for trigger %s", trigger->name);
+                               goto error_free_ht_element;
                        }
-
-                       CDS_INIT_LIST_HEAD(&client_list_element->node);
-                       client_list_element->client = client;
-                       cds_list_add(&client_list_element->node,
-                                       &client_list->list);
                }
 
-               /*
-                * Client list ownership transferred to the
-                * notification_trigger_clients_ht.
-                */
-               publish_notification_client_list(state, client_list);
+               CDS_INIT_LIST_HEAD(&trigger_ht_element->client_list_trigger_node);
+
+               pthread_mutex_lock(&client_list->lock);
+               cds_list_add(&trigger_ht_element->client_list_trigger_node, &client_list->triggers_list);
+               pthread_mutex_unlock(&client_list->lock);
        }
 
+       /*
+        * Ownership of the trigger and of its wrapper was transfered to
+        * the triggers_ht. Same for token ht element if necessary.
+        */
+       trigger_ht_element = NULL;
+       free_trigger = false;
+
        switch (get_condition_binding_object(condition)) {
        case LTTNG_OBJECT_TYPE_SESSION:
                /* Add the trigger to the list if it matches a known session. */
                ret = bind_trigger_to_matching_session(trigger, state);
                if (ret) {
-                       goto error_put_client_list;
+                       goto error_free_ht_element;
                }
                break;
        case LTTNG_OBJECT_TYPE_CHANNEL:
@@ -2520,7 +2816,7 @@ int handle_notification_thread_command_register_trigger(
                 */
                ret = bind_trigger_to_matching_channels(trigger, state);
                if (ret) {
-                       goto error_put_client_list;
+                       goto error_free_ht_element;
                }
                break;
        case LTTNG_OBJECT_TYPE_NONE:
@@ -2528,7 +2824,7 @@ int handle_notification_thread_command_register_trigger(
        default:
                ERR("Unknown object type on which to bind a newly registered trigger was encountered");
                ret = -1;
-               goto error_put_client_list;
+               goto error_free_ht_element;
        }
 
        /*
@@ -2565,11 +2861,15 @@ int handle_notification_thread_command_register_trigger(
                ret = evaluate_session_condition_for_client(condition, state,
                                &evaluation, &object_uid,
                                &object_gid);
+               LTTNG_OPTIONAL_SET(&object_creds.uid, object_uid);
+               LTTNG_OPTIONAL_SET(&object_creds.gid, object_gid);
                break;
        case LTTNG_OBJECT_TYPE_CHANNEL:
                ret = evaluate_channel_condition_for_client(condition, state,
                                &evaluation, &object_uid,
                                &object_gid);
+               LTTNG_OPTIONAL_SET(&object_creds.uid, object_uid);
+               LTTNG_OPTIONAL_SET(&object_creds.gid, object_gid);
                break;
        case LTTNG_OBJECT_TYPE_NONE:
                ret = 0;
@@ -2582,26 +2882,23 @@ int handle_notification_thread_command_register_trigger(
 
        if (ret) {
                /* Fatal error. */
-               goto error_put_client_list;
+               goto error_free_ht_element;
        }
 
-       LTTNG_OPTIONAL_SET(&object_creds.uid, object_uid);
-       LTTNG_OPTIONAL_SET(&object_creds.gid, object_gid);
-
        DBG("Newly registered trigger's condition evaluated to %s",
                        evaluation ? "true" : "false");
        if (!evaluation) {
                /* Evaluation yielded nothing. Normal exit. */
                ret = 0;
-               goto end;
+               goto success;
        }
 
        /*
         * 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:
@@ -2614,7 +2911,7 @@ int handle_notification_thread_command_register_trigger(
                 */
                ERR("Fatal error occurred while enqueuing action associated to newly registered trigger");
                ret = -1;
-               goto error_put_client_list;
+               goto error_free_ht_element;
        case ACTION_EXECUTOR_STATUS_OVERFLOW:
                /*
                 * TODO Add trigger identification (name/id) when
@@ -2624,18 +2921,16 @@ int handle_notification_thread_command_register_trigger(
                 */
                WARN("No space left when enqueuing action associated to newly registered trigger");
                ret = 0;
-               goto end;
+               goto success;
        default:
                abort();
        }
 
-end:
+success:
        *cmd_result = LTTNG_OK;
        DBG("Registered trigger: name = `%s`, tracer token = %" PRIu64,
                        trigger_name, trigger_tracer_token);
-
-error_put_client_list:
-       notification_client_list_put(client_list);
+       goto end;
 
 error_free_ht_element:
        if (trigger_ht_element) {
@@ -2643,12 +2938,16 @@ error_free_ht_element:
                call_rcu(&trigger_ht_element->rcu_node,
                                free_lttng_trigger_ht_element_rcu);
        }
-
-       free(trigger_tokens_ht_element);
 error:
        if (free_trigger) {
+               /*
+                * Other objects might have a reference to the trigger, mark it
+                * as unregistered.
+                */
+               lttng_trigger_set_as_unregistered(trigger);
                lttng_trigger_destroy(trigger);
        }
+end:
        rcu_read_unlock();
        return ret;
 }
@@ -2667,10 +2966,40 @@ void free_notification_trigger_tokens_ht_element_rcu(struct rcu_head *node)
                        rcu_node));
 }
 
+static
+void teardown_tracer_notifier(struct notification_thread_state *state,
+               const struct lttng_trigger *trigger)
+{
+       struct cds_lfht_iter iter;
+       struct notification_trigger_tokens_ht_element *trigger_tokens_ht_element;
+
+       cds_lfht_for_each_entry(state->trigger_tokens_ht, &iter,
+                       trigger_tokens_ht_element, node) {
+
+               if (!lttng_trigger_is_equal(trigger,
+                                       trigger_tokens_ht_element->trigger)) {
+                       continue;
+               }
+
+               event_notifier_error_accounting_unregister_event_notifier(
+                               trigger_tokens_ht_element->trigger);
+
+               /* TODO talk to all app and remove it */
+               DBG("Removed trigger from tokens_ht");
+               cds_lfht_del(state->trigger_tokens_ht,
+                               &trigger_tokens_ht_element->node);
+
+               call_rcu(&trigger_tokens_ht_element->rcu_node,
+                               free_notification_trigger_tokens_ht_element_rcu);
+
+               break;
+       }
+}
+
 static
 int handle_notification_thread_command_unregister_trigger(
                struct notification_thread_state *state,
-               struct lttng_trigger *trigger,
+               const struct lttng_trigger *trigger,
                enum lttng_error_code *_cmd_reply)
 {
        struct cds_lfht_iter iter;
@@ -2678,7 +3007,7 @@ int handle_notification_thread_command_unregister_trigger(
        struct lttng_channel_trigger_list *trigger_list;
        struct notification_client_list *client_list;
        struct lttng_trigger_ht_element *trigger_ht_element = NULL;
-       struct lttng_condition *condition = lttng_trigger_get_condition(
+       const struct lttng_condition *condition = lttng_trigger_get_const_condition(
                        trigger);
        enum lttng_error_code cmd_reply;
 
@@ -2697,6 +3026,9 @@ int handle_notification_thread_command_unregister_trigger(
                cmd_reply = LTTNG_OK;
        }
 
+       trigger_ht_element = caa_container_of(triggers_ht_node,
+                       struct lttng_trigger_ht_element, node);
+
        /* Remove trigger from channel_triggers_ht. */
        cds_lfht_for_each_entry(state->channel_triggers_ht, &iter, trigger_list,
                        channel_triggers_ht_node) {
@@ -2708,33 +3040,15 @@ int handle_notification_thread_command_unregister_trigger(
                                continue;
                        }
 
-                       DBG("[notification-thread] Removed trigger from channel_triggers_ht");
+                       DBG("Removed trigger from channel_triggers_ht");
                        cds_list_del(&trigger_element->node);
                        /* A trigger can only appear once per channel */
                        break;
                }
        }
 
-       if (lttng_condition_get_type(condition) ==
-                       LTTNG_CONDITION_TYPE_EVENT_RULE_HIT) {
-               struct notification_trigger_tokens_ht_element
-                               *trigger_tokens_ht_element;
-
-               cds_lfht_for_each_entry (state->trigger_tokens_ht, &iter,
-                               trigger_tokens_ht_element, node) {
-                       if (!lttng_trigger_is_equal(trigger,
-                                           trigger_tokens_ht_element->trigger)) {
-                               continue;
-                       }
-
-                       DBG("[notification-thread] Removed trigger from tokens_ht");
-                       cds_lfht_del(state->trigger_tokens_ht,
-                                       &trigger_tokens_ht_element->node);
-                       call_rcu(&trigger_tokens_ht_element->rcu_node,
-                                       free_notification_trigger_tokens_ht_element_rcu);
-
-                       break;
-               }
+       if (lttng_trigger_needs_tracer_notifier(trigger)) {
+               teardown_tracer_notifier(state, trigger);
        }
 
        if (is_trigger_action_notify(trigger)) {
@@ -2745,6 +3059,10 @@ int handle_notification_thread_command_unregister_trigger(
                client_list = get_client_list_from_condition(state, condition);
                assert(client_list);
 
+               pthread_mutex_lock(&client_list->lock);
+               cds_list_del(&trigger_ht_element->client_list_trigger_node);
+               pthread_mutex_unlock(&client_list->lock);
+
                /* Put new reference and the hashtable's reference. */
                notification_client_list_put(client_list);
                notification_client_list_put(client_list);
@@ -2752,10 +3070,7 @@ int handle_notification_thread_command_unregister_trigger(
        }
 
        /* Remove trigger from triggers_ht. */
-       trigger_ht_element = caa_container_of(triggers_ht_node,
-                       struct lttng_trigger_ht_element, node);
-       cds_lfht_del(state->triggers_by_name_uid_ht, &trigger_ht_element->node_by_name_uid);
-       cds_lfht_del(state->triggers_ht, triggers_ht_node);
+       notif_thread_state_remove_trigger_ht_elem(state, trigger_ht_element);
 
        /* Release the ownership of the trigger. */
        lttng_trigger_destroy(trigger_ht_element->trigger);
@@ -2789,21 +3104,23 @@ int handle_notification_thread_command(
                        struct notification_thread_command, cmd_list_node);
        cds_list_del(&cmd->cmd_list_node);
        pthread_mutex_unlock(&handle->cmd_queue.lock);
+
+       DBG("Received `%s` command",
+                       notification_command_type_str(cmd->type));
        switch (cmd->type) {
        case NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER:
-               DBG("[notification-thread] Received register trigger command");
-               ret = handle_notification_thread_command_register_trigger(
-                               state, cmd->parameters.trigger,
+               ret = handle_notification_thread_command_register_trigger(state,
+                               cmd->parameters.register_trigger.trigger,
+                               cmd->parameters.register_trigger.is_trigger_anonymous,
                                &cmd->reply_code);
                break;
        case NOTIFICATION_COMMAND_TYPE_UNREGISTER_TRIGGER:
-               DBG("[notification-thread] Received unregister trigger command");
                ret = handle_notification_thread_command_unregister_trigger(
-                               state, cmd->parameters.trigger,
+                               state,
+                               cmd->parameters.unregister_trigger.trigger,
                                &cmd->reply_code);
                break;
        case NOTIFICATION_COMMAND_TYPE_ADD_CHANNEL:
-               DBG("[notification-thread] Received add channel command");
                ret = handle_notification_thread_command_add_channel(
                                state,
                                cmd->parameters.add_channel.session.name,
@@ -2816,7 +3133,6 @@ int handle_notification_thread_command(
                                &cmd->reply_code);
                break;
        case NOTIFICATION_COMMAND_TYPE_REMOVE_CHANNEL:
-               DBG("[notification-thread] Received remove channel command");
                ret = handle_notification_thread_command_remove_channel(
                                state, cmd->parameters.remove_channel.key,
                                cmd->parameters.remove_channel.domain,
@@ -2824,9 +3140,6 @@ int handle_notification_thread_command(
                break;
        case NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_ONGOING:
        case NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_COMPLETED:
-               DBG("[notification-thread] Received session rotation %s command",
-                               cmd->type == NOTIFICATION_COMMAND_TYPE_SESSION_ROTATION_ONGOING ?
-                               "ongoing" : "completed");
                ret = handle_notification_thread_command_session_rotation(
                                state,
                                cmd->type,
@@ -2865,10 +3178,19 @@ int handle_notification_thread_command(
                break;
        }
        case NOTIFICATION_COMMAND_TYPE_QUIT:
-               DBG("[notification-thread] Received quit 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 =
@@ -2898,7 +3220,7 @@ int handle_notification_thread_command(
                break;
        }
        default:
-               ERR("[notification-thread] Unknown internal command received");
+               ERR("Unknown internal command received");
                goto error_unlock;
        }
 
@@ -2972,7 +3294,7 @@ int handle_notification_thread_client_connect(
        int ret;
        struct notification_client *client;
 
-       DBG("[notification-thread] Handling new notification channel client connection");
+       DBG("Handling new notification channel client connection");
 
        client = zmalloc(sizeof(*client));
        if (!client) {
@@ -2990,14 +3312,14 @@ int handle_notification_thread_client_connect(
 
        ret = client_reset_inbound_state(client);
        if (ret) {
-               ERR("[notification-thread] Failed to reset client communication's inbound state");
+               ERR("Failed to reset client communication's inbound state");
                ret = 0;
                goto error;
        }
 
        ret = lttcomm_accept_unix_sock(state->notification_channel_socket);
        if (ret < 0) {
-               ERR("[notification-thread] Failed to accept new notification channel client connection");
+               ERR("Failed to accept new notification channel client connection");
                ret = 0;
                goto error;
        }
@@ -3006,13 +3328,13 @@ int handle_notification_thread_client_connect(
 
        ret = socket_set_non_blocking(client->socket);
        if (ret) {
-               ERR("[notification-thread] Failed to set new notification channel client connection socket as non-blocking");
+               ERR("Failed to set new notification channel client connection socket as non-blocking");
                goto error;
        }
 
        ret = lttcomm_setsockopt_creds_unix_sock(client->socket);
        if (ret < 0) {
-               ERR("[notification-thread] Failed to set socket options on new notification channel client socket");
+               ERR("Failed to set socket options on new notification channel client socket");
                ret = 0;
                goto error;
        }
@@ -3021,11 +3343,11 @@ int handle_notification_thread_client_connect(
                        LPOLLIN | LPOLLERR |
                        LPOLLHUP | LPOLLRDHUP);
        if (ret < 0) {
-               ERR("[notification-thread] Failed to add notification channel client socket to poll set");
+               ERR("Failed to add notification channel client socket to poll set");
                ret = 0;
                goto error;
        }
-       DBG("[notification-thread] Added new notification channel client socket (%i) to poll set",
+       DBG("Added new notification channel client socket (%i) to poll set",
                        client->socket);
 
        rcu_read_lock();
@@ -3065,7 +3387,7 @@ int notification_thread_client_disconnect(
 
        ret = lttng_poll_del(&state->events, client->socket);
        if (ret) {
-               ERR("[notification-thread] Failed to remove client socket %d from poll set",
+               ERR("Failed to remove client socket %d from poll set",
                                client->socket);
        }
 
@@ -3091,12 +3413,12 @@ int handle_notification_thread_client_disconnect(
        struct notification_client *client;
 
        rcu_read_lock();
-       DBG("[notification-thread] Closing client connection (socket fd = %i)",
+       DBG("Closing client connection (socket fd = %i)",
                        client_socket);
        client = get_client_from_socket(client_socket, state);
        if (!client) {
                /* Internal state corruption, fatal error. */
-               ERR("[notification-thread] Unable to find client (socket fd = %i)",
+               ERR("Unable to find client (socket fd = %i)",
                                client_socket);
                ret = -1;
                goto end;
@@ -3116,7 +3438,7 @@ int handle_notification_thread_client_disconnect_all(
        bool error_encoutered = false;
 
        rcu_read_lock();
-       DBG("[notification-thread] Closing all client connections");
+       DBG("Closing all client connections");
        cds_lfht_for_each_entry(state->client_socket_ht, &iter, client,
                        client_socket_ht_node) {
                int ret;
@@ -3226,14 +3548,14 @@ enum client_transmission_status client_flush_outgoing_queue(
 
        /* Send data. */
        to_send_count = pv.buffer.size;
-       DBG("[notification-thread] Flushing client (socket fd = %i) outgoing queue",
+       DBG("Flushing client (socket fd = %i) outgoing queue",
                        client->socket);
 
        ret = lttcomm_send_unix_sock_non_block(client->socket,
                        pv.buffer.data,
                        to_send_count);
        if ((ret >= 0 && ret < to_send_count)) {
-               DBG("[notification-thread] Client (socket fd = %i) outgoing queue could not be completely flushed",
+               DBG("Client (socket fd = %i) outgoing queue could not be completely flushed",
                                client->socket);
                to_send_count -= max(ret, 0);
 
@@ -3252,7 +3574,7 @@ enum client_transmission_status client_flush_outgoing_queue(
                goto end;
        } else if (ret < 0) {
                /* Generic error, disable the client's communication. */
-               ERR("[notification-thread] Failed to flush outgoing queue, disconnecting client (socket fd = %i)",
+               ERR("Failed to flush outgoing queue, disconnecting client (socket fd = %i)",
                                client->socket);
                client->communication.active = false;
                status = CLIENT_TRANSMISSION_STATUS_FAIL;
@@ -3284,7 +3606,7 @@ send_fds:
                        client->socket, &pv);
        if (ret < 0) {
                /* Generic error, disable the client's communication. */
-               ERR("[notification-thread] Failed to flush outgoing fds queue, disconnecting client (socket fd = %i)",
+               ERR("Failed to flush outgoing fds queue, disconnecting client (socket fd = %i)",
                                client->socket);
                client->communication.active = false;
                status = CLIENT_TRANSMISSION_STATUS_FAIL;
@@ -3349,7 +3671,7 @@ int client_send_command_reply(struct notification_client *client,
 
        memcpy(buffer, &msg, sizeof(msg));
        memcpy(buffer + sizeof(msg), &reply, sizeof(reply));
-       DBG("[notification-thread] Send command reply (%i)", (int) status);
+       DBG("Send command reply (%i)", (int) status);
 
        pthread_mutex_lock(&client->lock);
        if (client->communication.outbound.queued_command_reply) {
@@ -3404,7 +3726,7 @@ int client_handle_message_unknown(struct notification_client *client,
 
        if (msg->size == 0 ||
                        msg->size > DEFAULT_MAX_NOTIFICATION_CLIENT_MESSAGE_PAYLOAD_SIZE) {
-               ERR("[notification-thread] Invalid notification channel message: length = %u",
+               ERR("Invalid notification channel message: length = %u",
                                msg->size);
                ret = -1;
                goto end;
@@ -3417,7 +3739,7 @@ int client_handle_message_unknown(struct notification_client *client,
                break;
        default:
                ret = -1;
-               ERR("[notification-thread] Invalid notification channel message: unexpected message type");
+               ERR("Invalid notification channel message: unexpected message type");
                goto end;
        }
 
@@ -3463,7 +3785,7 @@ int client_handle_message_handshake(struct notification_client *client,
        client->major = handshake_client->major;
        client->minor = handshake_client->minor;
        if (!client->communication.inbound.creds_received) {
-               ERR("[notification-thread] No credentials received from client");
+               ERR("No credentials received from client");
                ret = -1;
                goto end;
        }
@@ -3472,7 +3794,7 @@ int client_handle_message_handshake(struct notification_client *client,
                        &client->communication.inbound.creds);
        client->gid = LTTNG_SOCK_GET_GID_CRED(
                        &client->communication.inbound.creds);
-       DBG("[notification-thread] Received handshake from client (uid = %u, gid = %u) with version %i.%i",
+       DBG("Received handshake from client (uid = %u, gid = %u) with version %i.%i",
                        client->uid, client->gid, (int) client->major,
                        (int) client->minor);
 
@@ -3487,7 +3809,7 @@ int client_handle_message_handshake(struct notification_client *client,
                        &client->communication.outbound.payload.buffer, send_buffer,
                        sizeof(send_buffer));
        if (ret) {
-               ERR("[notification-thread] Failed to send protocol version to notification channel client");
+               ERR("Failed to send protocol version to notification channel client");
                goto end_unlock;
        }
 
@@ -3498,14 +3820,14 @@ int client_handle_message_handshake(struct notification_client *client,
        /* Set reception state to receive the next message header. */
        ret = client_reset_inbound_state(client);
        if (ret) {
-               ERR("[notification-thread] Failed to reset client communication's inbound state");
+               ERR("Failed to reset client communication's inbound state");
                goto end;
        }
 
        /* Flushes the outgoing queue. */
        ret = client_send_command_reply(client, state, status);
        if (ret) {
-               ERR("[notification-thread] Failed to send reply to notification channel client");
+               ERR("Failed to send reply to notification channel client");
                goto end;
        }
 
@@ -3540,10 +3862,11 @@ int client_handle_message_subscription(
        expected_condition_size = client->communication.inbound.payload.buffer.size;
        ret = lttng_condition_create_from_payload(&condition_view, &condition);
        if (ret != expected_condition_size) {
-               ERR("[notification-thread] Malformed condition received from client");
+               ERR("Malformed condition received from client");
                goto end;
        }
 
+       /* Ownership of condition is always transferred. */
        if (msg_type == LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_SUBSCRIBE) {
                ret = notification_thread_client_subscribe(
                                client, condition, state, &status);
@@ -3559,13 +3882,13 @@ int client_handle_message_subscription(
        /* Set reception state to receive the next message header. */
        ret = client_reset_inbound_state(client);
        if (ret) {
-               ERR("[notification-thread] Failed to reset client communication's inbound state");
+               ERR("Failed to reset client communication's inbound state");
                goto end;
        }
 
        ret = client_send_command_reply(client, state, status);
        if (ret) {
-               ERR("[notification-thread] Failed to send reply to notification channel client");
+               ERR("Failed to send reply to notification channel client");
                goto end;
        }
 
@@ -3584,7 +3907,7 @@ int client_dispatch_message(struct notification_client *client,
                        client->communication.inbound.msg_type !=
                                LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_UNKNOWN &&
                        !client->validated) {
-               WARN("[notification-thread] client attempted a command before handshake");
+               WARN("client attempted a command before handshake");
                ret = -1;
                goto end;
        }
@@ -3631,6 +3954,12 @@ int handle_notification_thread_client_in(
                goto end;
        }
 
+       if (client->communication.inbound.bytes_to_receive == 0 &&
+                       client->communication.inbound.fds_to_receive != 0) {
+               /* Only FDs left to receive. */
+               goto receive_fds;
+       }
+
        offset = client->communication.inbound.payload.buffer.size -
                        client->communication.inbound.bytes_to_receive;
        if (client->communication.inbound.expect_creds) {
@@ -3659,6 +3988,7 @@ int handle_notification_thread_client_in(
                goto end;
        }
 
+receive_fds:
        assert(client->communication.inbound.bytes_to_receive == 0);
 
        /* Receive fds. */
@@ -3772,7 +4102,7 @@ bool evaluate_buffer_usage_condition(const struct lttng_condition *condition,
 
        condition_type = lttng_condition_get_type(condition);
        if (condition_type == LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW) {
-               DBG("[notification-thread] Low buffer usage condition being evaluated: threshold = %" PRIu64 ", highest usage = %" PRIu64,
+               DBG("Low buffer usage condition being evaluated: threshold = %" PRIu64 ", highest usage = %" PRIu64,
                                threshold, sample->highest_usage);
 
                /*
@@ -3783,7 +4113,7 @@ bool evaluate_buffer_usage_condition(const struct lttng_condition *condition,
                        result = true;
                }
        } else {
-               DBG("[notification-thread] High buffer usage condition being evaluated: threshold = %" PRIu64 ", highest usage = %" PRIu64,
+               DBG("High buffer usage condition being evaluated: threshold = %" PRIu64 ", highest usage = %" PRIu64,
                                threshold, sample->highest_usage);
 
                /*
@@ -3810,7 +4140,7 @@ bool evaluate_session_consumed_size_condition(
                                parent);
 
        threshold = size_condition->consumed_threshold_bytes.value;
-       DBG("[notification-thread] Session consumed size condition being evaluated: threshold = %" PRIu64 ", current size = %" PRIu64,
+       DBG("Session consumed size condition being evaluated: threshold = %" PRIu64 ", current size = %" PRIu64,
                        threshold, session_consumed_size);
        return session_consumed_size >= threshold;
 }
@@ -3956,8 +4286,7 @@ int send_evaluation_to_clients(const struct lttng_trigger *trigger,
        };
 
        return notification_client_list_send_evaluation(client_list,
-                       lttng_trigger_get_const_condition(trigger), evaluation,
-                       lttng_trigger_get_credentials(trigger),
+                       trigger, evaluation,
                        &creds,
                        client_handle_transmission_status_wrapper, state);
 }
@@ -3998,9 +4327,8 @@ int send_evaluation_to_clients(const struct lttng_trigger *trigger,
 LTTNG_HIDDEN
 int notification_client_list_send_evaluation(
                struct notification_client_list *client_list,
-               const struct lttng_condition *condition,
+               const struct lttng_trigger *trigger,
                const struct lttng_evaluation *evaluation,
-               const struct lttng_credentials *trigger_creds,
                const struct lttng_credentials *source_object_creds,
                report_client_transmission_result_cb client_report,
                void *user_data)
@@ -4009,12 +4337,14 @@ int notification_client_list_send_evaluation(
        struct lttng_payload msg_payload;
        struct notification_client_list_element *client_list_element, *tmp;
        const struct lttng_notification notification = {
-               .condition = (struct lttng_condition *) condition,
+               .trigger = (struct lttng_trigger *) trigger,
                .evaluation = (struct lttng_evaluation *) evaluation,
        };
        struct lttng_notification_channel_message msg_header = {
                .type = (int8_t) LTTNG_NOTIFICATION_CHANNEL_MESSAGE_TYPE_NOTIFICATION,
        };
+       const struct lttng_credentials *trigger_creds =
+                       lttng_trigger_get_credentials(trigger);
 
        lttng_payload_init(&msg_payload);
 
@@ -4026,7 +4356,7 @@ int notification_client_list_send_evaluation(
 
        ret = lttng_notification_serialize(&notification, &msg_payload);
        if (ret) {
-               ERR("[notification-thread] Failed to serialize notification");
+               ERR("Failed to serialize notification");
                ret = -1;
                goto end;
        }
@@ -4048,7 +4378,7 @@ int notification_client_list_send_evaluation(
 
        pthread_mutex_lock(&client_list->lock);
        cds_list_for_each_entry_safe(client_list_element, tmp,
-                       &client_list->list, node) {
+                       &client_list->clients_list, node) {
                enum client_transmission_status transmission_status;
                struct notification_client *client =
                                client_list_element->client;
@@ -4072,17 +4402,17 @@ int notification_client_list_send_evaluation(
                                 * Client is not allowed to monitor this
                                 * object.
                                 */
-                               DBG("[notification-thread] Skipping client at it does not have the object permission to receive notification for this trigger");
+                               DBG("Skipping client at it does not have the object permission to receive notification for this trigger");
                                goto skip_client;
                        }
                }
 
-               if (client->uid != lttng_credentials_get_uid(trigger_creds) && client->gid != lttng_credentials_get_gid(trigger_creds)) {
-                       DBG("[notification-thread] Skipping client at it does not have the permission to receive notification for this trigger");
+               if (client->uid != lttng_credentials_get_uid(trigger_creds)) {
+                       DBG("Skipping client at it does not have the permission to receive notification for this trigger");
                        goto skip_client;
                }
 
-               DBG("[notification-thread] Sending notification to client (fd = %i, %zu bytes)",
+               DBG("Sending notification to client (fd = %i, %zu bytes)",
                                client->socket, msg_payload.buffer.size);
 
                if (client_has_outbound_data_left(client)) {
@@ -4132,6 +4462,274 @@ end:
        return ret;
 }
 
+static
+struct lttng_event_notifier_notification *recv_one_event_notifier_notification(
+               int notification_pipe_read_fd, enum lttng_domain_type domain)
+{
+       int ret;
+       uint64_t token;
+       struct lttng_event_notifier_notification *notification = NULL;
+       char *capture_buffer = NULL;
+       size_t capture_buffer_size;
+       void *reception_buffer;
+       size_t reception_size;
+
+       struct lttng_ust_abi_event_notifier_notification ust_notification;
+       struct lttng_kernel_abi_event_notifier_notification kernel_notification;
+
+       /* Init lttng_event_notifier_notification */
+       switch(domain) {
+       case LTTNG_DOMAIN_UST:
+               reception_buffer = (void *) &ust_notification;
+               reception_size = sizeof(ust_notification);
+               break;
+       case LTTNG_DOMAIN_KERNEL:
+               reception_buffer = (void *) &kernel_notification;
+               reception_size = sizeof(kernel_notification);
+               break;
+       default:
+               abort();
+       }
+
+       /*
+        * The monitoring pipe only holds messages smaller than PIPE_BUF,
+        * ensuring that read/write of tracer notifications are atomic.
+        */
+       ret = lttng_read(notification_pipe_read_fd, reception_buffer,
+                       reception_size);
+       if (ret != reception_size) {
+               PERROR("Failed to read from event source notification pipe: fd = %d, size to read = %zu, ret = %d",
+                               notification_pipe_read_fd, reception_size, ret);
+               ret = -1;
+               goto end;
+       }
+
+       switch(domain) {
+       case LTTNG_DOMAIN_UST:
+               token = ust_notification.token;
+               capture_buffer_size = ust_notification.capture_buf_size;
+               break;
+       case LTTNG_DOMAIN_KERNEL:
+               token = kernel_notification.token;
+               capture_buffer_size = kernel_notification.capture_buf_size;
+               break;
+       default:
+               abort();
+       }
+
+       if (capture_buffer_size == 0) {
+               capture_buffer = NULL;
+               goto skip_capture;
+       }
+
+       if (capture_buffer_size > MAX_CAPTURE_SIZE) {
+               ERR("Event notifier has a capture payload size which exceeds the maximum allowed size: capture_payload_size = %zu bytes, max allowed size = %d bytes",
+                               capture_buffer_size, MAX_CAPTURE_SIZE);
+               goto end;
+       }
+
+       capture_buffer = zmalloc(capture_buffer_size);
+       if (!capture_buffer) {
+               ERR("Failed to allocate capture buffer");
+               goto end;
+       }
+
+       /* Fetch additional payload (capture). */
+       ret = lttng_read(notification_pipe_read_fd, capture_buffer, capture_buffer_size);
+       if (ret != capture_buffer_size) {
+               ERR("Failed to read from event source pipe (fd = %i)",
+                               notification_pipe_read_fd);
+               goto end;
+       }
+
+skip_capture:
+       notification = lttng_event_notifier_notification_create(token, domain,
+                       capture_buffer, capture_buffer_size);
+       if (notification == NULL) {
+               goto end;
+       }
+
+       /*
+        * Ownership transfered to the lttng_event_notifier_notification object.
+        */
+       capture_buffer = NULL;
+
+end:
+       free(capture_buffer);
+       return notification;
+}
+
+static
+int dispatch_one_event_notifier_notification(struct notification_thread_state *state,
+               struct lttng_event_notifier_notification *notification)
+{
+       struct cds_lfht_node *node;
+       struct cds_lfht_iter iter;
+       struct notification_trigger_tokens_ht_element *element;
+       struct lttng_evaluation *evaluation = NULL;
+       enum action_executor_status executor_status;
+       struct notification_client_list *client_list = NULL;
+       int ret;
+       unsigned int capture_count = 0;
+
+       /* Find triggers associated with this token. */
+       rcu_read_lock();
+       cds_lfht_lookup(state->trigger_tokens_ht,
+                       hash_key_u64(&notification->tracer_token, lttng_ht_seed),
+                       match_trigger_token, &notification->tracer_token, &iter);
+       node = cds_lfht_iter_get_node(&iter);
+       if (caa_unlikely(!node)) {
+               /*
+                * This is not an error, slow consumption of the tracer
+                * notifications can lead to situations where a trigger is
+                * removed but we still get tracer notifications matching a
+                * trigger that no longer exists.
+                */
+               ret = 0;
+               goto end_unlock;
+       }
+
+       element = caa_container_of(node,
+                       struct notification_trigger_tokens_ht_element,
+                       node);
+
+       if (lttng_condition_event_rule_matches_get_capture_descriptor_count(
+                           lttng_trigger_get_const_condition(element->trigger),
+                           &capture_count) != LTTNG_CONDITION_STATUS_OK) {
+               ERR("Failed to get capture count");
+               ret = -1;
+               goto end;
+       }
+
+       if (!notification->capture_buffer && capture_count != 0) {
+               ERR("Expected capture but capture buffer is null");
+               ret = -1;
+               goto end;
+       }
+
+       evaluation = lttng_evaluation_event_rule_matches_create(
+                       container_of(lttng_trigger_get_const_condition(
+                                                    element->trigger),
+                                       struct lttng_condition_event_rule_matches,
+                                       parent),
+                       notification->capture_buffer,
+                       notification->capture_buf_size, false);
+
+       if (evaluation == NULL) {
+               ERR("Failed to create event rule matches evaluation while creating and enqueuing action executor job");
+               ret = -1;
+               goto end_unlock;
+       }
+
+       client_list = get_client_list_from_condition(state,
+                       lttng_trigger_get_const_condition(element->trigger));
+       executor_status = action_executor_enqueue_trigger(state->executor,
+                       element->trigger, evaluation, NULL, client_list);
+       switch (executor_status) {
+       case ACTION_EXECUTOR_STATUS_OK:
+               ret = 0;
+               break;
+       case ACTION_EXECUTOR_STATUS_OVERFLOW:
+       {
+               struct notification_client_list_element *client_list_element,
+                               *tmp;
+
+               /*
+                * Not a fatal error; this is expected and simply means the
+                * executor has too much work queued already.
+                */
+               ret = 0;
+
+               /* No clients subscribed to notifications for this trigger. */
+               if (!client_list) {
+                       break;
+               }
+
+               /* Warn clients that a notification (or more) was dropped. */
+               pthread_mutex_lock(&client_list->lock);
+               cds_list_for_each_entry_safe(client_list_element, tmp,
+                               &client_list->clients_list, node) {
+                       enum client_transmission_status transmission_status;
+                       struct notification_client *client =
+                                       client_list_element->client;
+
+                       pthread_mutex_lock(&client->lock);
+                       ret = client_notification_overflow(client);
+                       if (ret) {
+                               /* Fatal error. */
+                               goto next_client;
+                       }
+
+                       transmission_status =
+                                       client_flush_outgoing_queue(client);
+                       ret = client_handle_transmission_status(
+                                       client, transmission_status, state);
+                       if (ret) {
+                               /* Fatal error. */
+                               goto next_client;
+                       }
+next_client:
+                       pthread_mutex_unlock(&client->lock);
+                       if (ret) {
+                               break;
+                       }
+               }
+
+               pthread_mutex_unlock(&client_list->lock);
+               break;
+       }
+       case ACTION_EXECUTOR_STATUS_INVALID:
+       case ACTION_EXECUTOR_STATUS_ERROR:
+               /* Fatal error, shut down everything. */
+               ERR("Fatal error encoutered while enqueuing action to the action executor");
+               ret = -1;
+               goto end_unlock;
+       default:
+               /* Unhandled error. */
+               abort();
+       }
+
+end_unlock:
+       notification_client_list_put(client_list);
+       rcu_read_unlock();
+end:
+       return ret;
+}
+
+static
+int handle_one_event_notifier_notification(
+               struct notification_thread_state *state,
+               int pipe, enum lttng_domain_type domain)
+{
+       int ret = 0;
+       struct lttng_event_notifier_notification *notification = NULL;
+
+       notification = recv_one_event_notifier_notification(pipe, domain);
+       if (notification == NULL) {
+               /* Reception failed, don't consider it fatal. */
+               ERR("Error receiving an event notifier notification from tracer: fd = %i, domain = %s",
+                               pipe, lttng_domain_type_str(domain));
+               goto end;
+       }
+
+       ret = dispatch_one_event_notifier_notification(state, notification);
+       if (ret) {
+               ERR("Error dispatching an event notifier notification from tracer: fd = %i, domain = %s",
+                               pipe, lttng_domain_type_str(domain));
+               goto end;
+       }
+
+end:
+       lttng_event_notifier_notification_destroy(notification);
+       return ret;
+}
+
+int handle_notification_thread_event_notification(struct notification_thread_state *state,
+               int pipe, enum lttng_domain_type domain)
+{
+       return handle_one_event_notifier_notification(state, pipe, domain);
+}
+
 int handle_notification_thread_channel_sample(
                struct notification_thread_state *state, int pipe,
                enum lttng_domain_type domain)
@@ -4154,7 +4752,7 @@ int handle_notification_thread_channel_sample(
         */
        ret = lttng_read(pipe, &sample_msg, sizeof(sample_msg));
        if (ret != sizeof(sample_msg)) {
-               ERR("[notification-thread] Failed to read from monitoring pipe (fd = %i)",
+               ERR("Failed to read from monitoring pipe (fd = %i)",
                                pipe);
                ret = -1;
                goto end;
@@ -4183,15 +4781,14 @@ int handle_notification_thread_channel_sample(
                 * channel's destruction before we get a chance to process that
                 * sample.
                 */
-               DBG("[notification-thread] Received a sample for an unknown channel from consumerd, key = %" PRIu64 " in %s domain",
+               DBG("Received a sample for an unknown channel from consumerd, key = %" PRIu64 " in %s domain",
                                latest_sample.key.key,
-                               domain == LTTNG_DOMAIN_KERNEL ? "kernel" :
-                                       "user space");
+                               lttng_domain_type_str(domain));
                goto end_unlock;
        }
        channel_info = caa_container_of(node, struct channel_info,
                        channels_ht_node);
-       DBG("[notification-thread] Handling channel sample for channel %s (key = %" PRIu64 ") in session %s (highest usage = %" PRIu64 ", lowest usage = %" PRIu64", total consumed = %" PRIu64")",
+       DBG("Handling channel sample for channel %s (key = %" PRIu64 ") in session %s (highest usage = %" PRIu64 ", lowest usage = %" PRIu64", total consumed = %" PRIu64")",
                        channel_info->name,
                        latest_sample.key.key,
                        channel_info->session_info->name,
@@ -4305,19 +4902,13 @@ 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.
                 */
-               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:
This page took 0.055767 seconds and 4 git commands to generate.