Bind newly registered triggers to session or channel objects

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index d04d3c2c1b89791f15a7adebfa2f0da474756c98..4904a54575e512c1ed4297a98eed17e7abc95dea 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -51,6 +51,13 @@
 #define CLIENT_POLL_MASK_IN (LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP)
 #define CLIENT_POLL_MASK_IN_OUT (CLIENT_POLL_MASK_IN | LPOLLOUT)
 
 #define CLIENT_POLL_MASK_IN (LPOLLIN | LPOLLERR | LPOLLHUP | LPOLLRDHUP)
 #define CLIENT_POLL_MASK_IN_OUT (CLIENT_POLL_MASK_IN | LPOLLOUT)
 

+enum lttng_object_type {
+       LTTNG_OBJECT_TYPE_UNKNOWN,
+       LTTNG_OBJECT_TYPE_NONE,
+       LTTNG_OBJECT_TYPE_CHANNEL,
+       LTTNG_OBJECT_TYPE_SESSION,
+};
+

 struct lttng_trigger_list_element {
        /* No ownership of the trigger object is assumed. */
        const struct lttng_trigger *trigger;
 struct lttng_trigger_list_element {
        /* No ownership of the trigger object is assumed. */
        const struct lttng_trigger *trigger;


@@ -279,6 +286,18 @@ int match_channel_trigger_list(struct cds_lfht_node *node, const void *key)
                        (channel_key->domain == trigger_list->channel_key.domain));
 }
 
                        (channel_key->domain == trigger_list->channel_key.domain));
 }
 

+static
+int match_session_trigger_list(struct cds_lfht_node *node, const void *key)
+{
+       const char *session_name = (const char *) key;
+       struct lttng_session_trigger_list *trigger_list;
+
+       trigger_list = caa_container_of(node, struct lttng_session_trigger_list,
+                       session_triggers_ht_node);
+
+       return !!(strcmp(trigger_list->session_name, session_name) == 0);
+}
+

 static
 int match_channel_state_sample(struct cds_lfht_node *node, const void *key)
 {
 static
 int match_channel_state_sample(struct cds_lfht_node *node, const void *key)
 {


@@ -969,8 +988,8 @@ end:
 
 static
 bool buffer_usage_condition_applies_to_channel(
 
 static
 bool buffer_usage_condition_applies_to_channel(

-               struct lttng_condition *condition,
-               struct channel_info *channel_info)
+               const struct lttng_condition *condition,
+               const struct channel_info *channel_info)

 {
        enum lttng_condition_status status;
        enum lttng_domain_type condition_domain;
 {
        enum lttng_condition_status status;
        enum lttng_domain_type condition_domain;


@@ -1006,8 +1025,8 @@ fail:
 
 static
 bool session_consumed_size_condition_applies_to_channel(
 
 static
 bool session_consumed_size_condition_applies_to_channel(

-               struct lttng_condition *condition,
-               struct channel_info *channel_info)
+               const struct lttng_condition *condition,
+               const struct channel_info *channel_info)

 {
        enum lttng_condition_status status;
        const char *condition_session_name = NULL;
 {
        enum lttng_condition_status status;
        const char *condition_session_name = NULL;


@@ -1025,14 +1044,42 @@ fail:
        return false;
 }
 
        return false;
 }
 

+/*
+ * Get the type of object to which a given trigger applies. Binding lets
+ * the notification system evaluate a trigger's condition when a given
+ * object's state is updated.
+ *
+ * For instance, a condition bound to a channel will be evaluated everytime
+ * the channel's state is changed by a channel monitoring sample.
+ */

 static
 static

-bool trigger_applies_to_channel(struct lttng_trigger *trigger,
-               struct channel_info *channel_info)
+enum lttng_object_type get_trigger_binding_object(
+               const struct lttng_trigger *trigger)

 {
 {

-       struct lttng_condition *condition;
+       const struct lttng_condition *condition;
+
+       condition = lttng_trigger_get_const_condition(trigger);
+       switch (lttng_condition_get_type(condition)) {
+       case LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW:
+       case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
+       case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
+               return LTTNG_OBJECT_TYPE_CHANNEL;
+       case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
+       case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
+               return LTTNG_OBJECT_TYPE_SESSION;
+       default:
+               return LTTNG_OBJECT_TYPE_UNKNOWN;
+       }
+}
+
+static
+bool trigger_applies_to_channel(const struct lttng_trigger *trigger,
+               const struct channel_info *channel_info)
+{
+       const struct lttng_condition *condition;

        bool trigger_applies;
 
        bool trigger_applies;
 

-       condition = lttng_trigger_get_condition(trigger);
+       condition = lttng_trigger_get_const_condition(trigger);

        if (!condition) {
                goto fail;
        }
        if (!condition) {
                goto fail;
        }


@@ -1507,13 +1554,118 @@ end:
        return ret;
 }
 
        return ret;
 }
 

+/* Must be called with RCU read lock held. */
+static
+int bind_trigger_to_matching_session(const struct lttng_trigger *trigger,
+               struct notification_thread_state *state)
+{
+       int ret = 0;
+       struct cds_lfht_node *node;
+       struct cds_lfht_iter iter;
+       const struct lttng_condition *condition;
+       const char *session_name;
+       struct lttng_session_trigger_list *trigger_list;
+
+       condition = lttng_trigger_get_const_condition(trigger);
+       switch (lttng_condition_get_type(condition)) {
+       case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
+       case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
+       {
+               enum lttng_condition_status status;
+
+               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");
+                       ret = -1;
+                       goto end;
+               }
+               break;
+       }
+       default:
+               ret = -1;
+               goto end;
+       }
+
+       cds_lfht_lookup(state->session_triggers_ht,
+                       hash_key_str(session_name, lttng_ht_seed),
+                       match_session_trigger_list,
+                       session_name,
+                       &iter);
+       node = cds_lfht_iter_get_node(&iter);
+       if (!node) {
+               /*
+                * Not an error, the list of triggers applying to that session
+                * will be initialized when the session is created.
+                */
+               DBG("[notification-thread] Unable to bind trigger applying to session \"%s\" as it is not yet known to the notification system",
+                               session_name);
+               goto end;
+       }
+
+       trigger_list = caa_container_of(node,
+                       struct lttng_session_trigger_list,
+                       session_triggers_ht_node);
+
+       DBG("[notification-thread] Newly registered trigger bound to session \"%s\"",
+                       session_name);
+       ret = lttng_session_trigger_list_add(trigger_list, trigger);
+end:
+       return ret;
+}
+
+/* Must be called with RCU read lock held. */
+static
+int bind_trigger_to_matching_channels(const struct lttng_trigger *trigger,
+               struct notification_thread_state *state)
+{
+       int ret = 0;
+       struct cds_lfht_node *node;
+       struct cds_lfht_iter iter;
+       struct channel_info *channel;
+
+       cds_lfht_for_each_entry(state->channels_ht, &iter, channel,
+                       channels_ht_node) {
+               struct lttng_trigger_list_element *trigger_list_element;
+               struct lttng_channel_trigger_list *trigger_list;
+
+               if (!trigger_applies_to_channel(trigger, channel)) {
+                       continue;
+               }
+
+               cds_lfht_lookup(state->channel_triggers_ht,
+                               hash_channel_key(&channel->key),
+                               match_channel_trigger_list,
+                               &channel->key,
+                               &iter);
+               node = cds_lfht_iter_get_node(&iter);
+               assert(node);
+               trigger_list = caa_container_of(node,
+                               struct lttng_channel_trigger_list,
+                               channel_triggers_ht_node);
+
+               trigger_list_element = zmalloc(sizeof(*trigger_list_element));
+               if (!trigger_list_element) {
+                       ret = -1;
+                       goto end;
+               }
+               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\"",
+                               channel->name);
+       }
+end:
+       return ret;
+}
+

 /*
  * FIXME A client's credentials are not checked when registering a trigger, nor
  *       are they stored alongside with the trigger.
  *
  * The effects of this are benign since:
  *     - The client will succeed in registering the trigger, as it is valid,
 /*
  * FIXME A client's credentials are not checked when registering a trigger, nor
  *       are they stored alongside with the trigger.
  *
  * The effects of this are benign since:
  *     - The client will succeed in registering the trigger, as it is valid,

- *     - The trigger will, internally, be bound to the channel,
+ *     - The trigger will, internally, be bound to the channel/session,

  *     - The notifications will not be sent since the client's credentials
  *       are checked against the channel at that moment.
  *
  *     - The notifications will not be sent since the client's credentials
  *       are checked against the channel at that moment.
  *


@@ -1537,7 +1689,6 @@ int handle_notification_thread_command_register_trigger(
        struct notification_client_list_element *client_list_element, *tmp;
        struct cds_lfht_node *node;
        struct cds_lfht_iter iter;
        struct notification_client_list_element *client_list_element, *tmp;
        struct cds_lfht_node *node;
        struct cds_lfht_iter iter;

-       struct channel_info *channel;

        bool free_trigger = true;
 
        rcu_read_lock();
        bool free_trigger = true;
 
        rcu_read_lock();


@@ -1619,38 +1770,29 @@ int handle_notification_thread_command_register_trigger(
                        lttng_condition_hash(condition),
                        &client_list->notification_trigger_ht_node);
 
                        lttng_condition_hash(condition),
                        &client_list->notification_trigger_ht_node);
 

-       /*
-        * Add the trigger to list of triggers bound to the channels currently
-        * known.
-        */
-       cds_lfht_for_each_entry(state->channels_ht, &iter, channel,
-                       channels_ht_node) {
-               struct lttng_trigger_list_element *trigger_list_element;
-               struct lttng_channel_trigger_list *trigger_list;
-
-               if (!trigger_applies_to_channel(trigger, channel)) {
-                       continue;
+       switch (get_trigger_binding_object(trigger)) {
+       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_free_client_list;

                }
                }

-
-               cds_lfht_lookup(state->channel_triggers_ht,
-                               hash_channel_key(&channel->key),
-                               match_channel_trigger_list,
-                               &channel->key,
-                               &iter);
-               node = cds_lfht_iter_get_node(&iter);
-               assert(node);
-               trigger_list = caa_container_of(node,
-                               struct lttng_channel_trigger_list,
-                               channel_triggers_ht_node);
-
-               trigger_list_element = zmalloc(sizeof(*trigger_list_element));
-               if (!trigger_list_element) {
-                       ret = -1;
+       case LTTNG_OBJECT_TYPE_CHANNEL:
+               /*
+                * Add the trigger to list of triggers bound to the channels
+                * currently known.
+                */
+               ret = bind_trigger_to_matching_channels(trigger, state);
+               if (ret) {

                        goto error_free_client_list;
                }
                        goto error_free_client_list;
                }

-               CDS_INIT_LIST_HEAD(&trigger_list_element->node);
-               trigger_list_element->trigger = trigger;
-               cds_list_add(&trigger_list_element->node, &trigger_list->list);
+               break;
+       case LTTNG_OBJECT_TYPE_NONE:
+               break;
+       default:
+               ERR("[notification-thread] Unknown object type on which to bind a newly registered trigger was encountered");
+               ret = -1;
+               goto error_free_client_list;

        }
 
        /*
        }
 
        /*

diff --git a/src/bin/lttng-sessiond/notification-thread-internal.h b/src/bin/lttng-sessiond/notification-thread-internal.h
index 6284ba1fa522f8b4c58f3ae8cb02bb2b6cf35abb..0bd575c233be3250cf27f94bce467372134c4b1f 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-internal.h
+++ b/src/bin/lttng-sessiond/notification-thread-internal.h
@@ -42,6 +42,12 @@ struct session_info {
        /* Node in the notification thread state's sessions_ht. */
        struct cds_lfht_node sessions_ht_node;
        uint64_t consumed_data_size;
        /* Node in the notification thread state's sessions_ht. */
        struct cds_lfht_node sessions_ht_node;
        uint64_t consumed_data_size;

+       struct {
+               /* Whether a rotation is ongoing for this session. */
+               bool ongoing;
+               /* Identifier of the currently ongoing rotation. */
+               uint64_t id;
+       } rotation;

 };
 
 struct channel_info {
 };
 
 struct channel_info {

diff --git a/src/bin/lttng-sessiond/notification-thread.h b/src/bin/lttng-sessiond/notification-thread.h
index d223789c7abb80f2ee52bc7969e20cc153e3f86c..eb8beb0d800588c58293aeb1471c18a040d3f9a8 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread.h
+++ b/src/bin/lttng-sessiond/notification-thread.h
@@ -120,12 +120,14 @@ struct notification_thread_handle {
  *   3) registration of a trigger,
  *   4) unregistration of a trigger,
  *   5) reception of a channel monitor sample from the consumer daemon.
  *   3) registration of a trigger,
  *   4) unregistration of a trigger,
  *   5) reception of a channel monitor sample from the consumer daemon.

+ *   6) Session rotation ongoing
+ *   7) Session rotation completed

  *
  * Events specific to notification-emitting triggers:
  *
  * Events specific to notification-emitting triggers:

- *   6) connection of a notification client,
- *   7) disconnection of a notification client,
- *   8) subscription of a client to a conditions' notifications,
- *   9) unsubscription of a client from a conditions' notifications,
+ *   8) connection of a notification client,
+ *   9) disconnection of a notification client,
+ *   10) subscription of a client to a conditions' notifications,
+ *   11) unsubscription of a client from a conditions' notifications,

  *
  *
  * 1) Creation of a tracing channel
  *
  *
  * 1) Creation of a tracing channel


@@ -172,22 +174,26 @@ struct notification_thread_handle {
  *        "notify", query the notification_trigger_clients_ht and send
  *        a notification to the clients.
  *
  *        "notify", query the notification_trigger_clients_ht and send
  *        a notification to the clients.
  *

- * 6) Connection of a client
+ * 6) Session rotation ongoing
+ *
+ * 7) Session rotation completed
+ *
+ * 8) Connection of a client

  *    - add client socket to the client_socket_ht.
  *
  *    - add client socket to the client_socket_ht.
  *

- * 7) Disconnection of a client
+ * 9) Disconnection of a client

  *    - remove client socket from the client_socket_ht,
  *    - traverse all conditions to which the client is subscribed and remove
  *      the client from the notification_trigger_clients_ht.
  *
  *    - remove client socket from the client_socket_ht,
  *    - traverse all conditions to which the client is subscribed and remove
  *      the client from the notification_trigger_clients_ht.
  *

- * 8) Subscription of a client to a condition's notifications
+ * 10) Subscription of a client to a condition's notifications

  *    - Add the condition to the client's list of subscribed conditions,
  *    - Look-up notification_trigger_clients_ht and add the client to
  *      list of clients.
  *    - Evaluate the condition for the client that subscribed if the trigger
  *      was already registered.
  *
  *    - Add the condition to the client's list of subscribed conditions,
  *    - Look-up notification_trigger_clients_ht and add the client to
  *      list of clients.
  *    - Evaluate the condition for the client that subscribed if the trigger
  *      was already registered.
  *

- * 9) Unsubscription of a client to a condition's notifications
+ * 11) Unsubscription of a client to a condition's notifications

  *    - Remove the condition from the client's list of subscribed conditions,
  *    - Look-up notification_trigger_clients_ht and remove the client
  *      from the list of clients.
  *    - Remove the condition from the client's list of subscribed conditions,
  *    - Look-up notification_trigger_clients_ht and remove the client
  *      from the list of clients.