Implements `lttng_event_notifier_notification_{create,destroy}()`

Capture payload will be later added to the lttng_event_notifier_notification object.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I404984c522cdf46c0df7c6ffbbe340d2f56cda2d
Depends-on: lttng-ust: I8423c510bf6af2f9bf85256e8d6f931d36f7054b

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index 7cbd5d509a81a5e1167c8ae00250fd45831cceb0..44bee3d3ba6f634e4fe14db72db3e612ead6a5d6 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -381,3 +381,37 @@ int notification_thread_client_communication_update(
        cmd.parameters.client_communication_update.status = transmission_status;
        return run_command_no_wait(handle, &cmd);
 }
+
+LTTNG_HIDDEN
+struct lttng_event_notifier_notification *
+lttng_event_notifier_notification_create(uint64_t tracer_token,
+               enum lttng_domain_type domain)
+{
+       struct lttng_event_notifier_notification *notification = NULL;
+
+       assert(domain != LTTNG_DOMAIN_NONE);
+
+       notification = zmalloc(
+                       sizeof(struct lttng_event_notifier_notification));
+       if (notification == NULL) {
+               ERR("[notification-thread] Error allocating notification");
+               goto end;
+       }
+
+       notification->tracer_token = tracer_token;
+       notification->type = domain;
+
+end:
+       return notification;
+}
+
+LTTNG_HIDDEN
+void lttng_event_notifier_notification_destroy(
+               struct lttng_event_notifier_notification *notification)
+{
+       if (!notification) {
+               return;
+       }
+
+       free(notification);
+}

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 99cf5173b7e8c3a8320900fafde9ed8df33cbf57..823f2a7eb3b2d53a4642844738ebd808445e2f26 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -125,19 +125,6 @@ struct lttng_condition_list_element {
        struct cds_list_head node;
 };
 
-/*
- * Facilities to carry the different notifications type in the action processing
- * code path.
- */
-struct lttng_event_notifier_notification {
-       union {
-               struct lttng_ust_event_notifier_notification *ust;
-               struct lttng_kernel_event_notifier_notification *kernel;
-       } notification;
-       uint64_t token;
-       enum lttng_domain_type type;
-};
-
 struct channel_state_sample {
        struct channel_key key;
        struct cds_lfht_node channel_state_ht_node;
@@ -4174,37 +4161,27 @@ end:
        return ret;
 }
 
-int handle_notification_thread_event_notification(struct notification_thread_state *state,
-               int notification_pipe_read_fd,
-               enum lttng_domain_type domain)
+static struct lttng_event_notifier_notification *receive_notification(
+               int notification_pipe_read_fd, enum lttng_domain_type domain)
 {
        int ret;
-       struct lttng_ust_event_notifier_notification ust_notification;
-       struct lttng_kernel_event_notifier_notification kernel_notification;
-       struct lttng_evaluation *evaluation = NULL;
-       struct cds_lfht_node *node;
-       struct cds_lfht_iter iter;
-       struct notification_trigger_tokens_ht_element *element;
-       enum lttng_trigger_status status;
-       struct lttng_event_notifier_notification notification;
+       uint64_t token;
+       struct lttng_event_notifier_notification *notification = NULL;
        void *reception_buffer;
        size_t reception_size;
-       enum action_executor_status executor_status;
-       struct notification_client_list *client_list = NULL;
-       const char *trigger_name;
 
-       notification.type = domain;
+       struct lttng_ust_event_notifier_notification ust_notification;
+       struct lttng_kernel_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);
-               notification.notification.ust = &ust_notification;
                break;
        case LTTNG_DOMAIN_KERNEL:
                reception_buffer = (void *) &kernel_notification;
                reception_size = sizeof(kernel_notification);
-               notification.notification.kernel = &kernel_notification;
                break;
        default:
                abort();
@@ -4225,20 +4202,49 @@ int handle_notification_thread_event_notification(struct notification_thread_sta
 
        switch(domain) {
        case LTTNG_DOMAIN_UST:
-               notification.token = ust_notification.token;
+               token = ust_notification.token;
                break;
        case LTTNG_DOMAIN_KERNEL:
-               notification.token = kernel_notification.token;
+               token = kernel_notification.token;
                break;
        default:
                abort();
        }
 
+       notification = lttng_event_notifier_notification_create(
+                       token, domain);
+end:
+       return notification;
+}
+
+int handle_notification_thread_event_notification(struct notification_thread_state *state,
+               int pipe,
+               enum lttng_domain_type domain)
+{
+       int ret;
+       enum lttng_trigger_status trigger_status;
+       struct cds_lfht_node *node;
+       struct cds_lfht_iter iter;
+       struct notification_trigger_tokens_ht_element *element;
+       struct lttng_evaluation *evaluation = NULL;
+       struct lttng_event_notifier_notification *notification = NULL;
+       enum action_executor_status executor_status;
+       struct notification_client_list *client_list = NULL;
+       const char *trigger_name;
+
+       notification = receive_notification(pipe, domain);
+       if (notification == NULL) {
+               ERR("[notification-thread] Error receiving notification from tracer (fd = %i, domain = %s)",
+                               pipe, lttng_domain_type_str(domain));
+               ret = -1;
+               goto end;
+       }
+
        /* Find triggers associated with this token. */
        rcu_read_lock();
        cds_lfht_lookup(state->trigger_tokens_ht,
-                       hash_key_u64(&notification.token, lttng_ht_seed),
-                       match_trigger_token, &notification.token, &iter);
+                       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)) {
                /*
@@ -4262,11 +4268,13 @@ int handle_notification_thread_event_notification(struct notification_thread_sta
 
        lttng_trigger_fire(element->trigger);
 
-       status = lttng_trigger_get_name(element->trigger, &trigger_name);
-       assert(status == LTTNG_TRIGGER_STATUS_OK);
-       evaluation = lttng_evaluation_event_rule_create(trigger_name);
+       trigger_status = lttng_trigger_get_name(element->trigger, &trigger_name);
+       assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+
+       evaluation = lttng_evaluation_event_rule_create(
+                       trigger_name);
        if (evaluation == NULL) {
-               ERR("Failed to create event rule evaluation while creating and enqueuing action executor job");
+               ERR("[notification-thread] Failed to create event rule hit evaluation while creating and enqueuing action executor job");
                ret = -1;
                goto end_unlock;
        }
@@ -4339,6 +4347,7 @@ next_client:
        }
 
 end_unlock:
+       lttng_event_notifier_notification_destroy(notification);
        notification_client_list_put(client_list);
        rcu_read_unlock();
 end:

diff --git a/src/bin/lttng-sessiond/notification-thread-internal.h b/src/bin/lttng-sessiond/notification-thread-internal.h
index eb23d1f78fa2df8d106cdb9fe4caddf1177bb90d..0403527dca1f4f5b67d0f25cbe0cb91efee27eda 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-internal.h
+++ b/src/bin/lttng-sessiond/notification-thread-internal.h
@@ -75,6 +75,15 @@ struct channel_info {
        struct rcu_head rcu_node;
 };
 
+/*
+ * Facilities to carry the different notifications type in the action
+ * processing code path.
+ */
+struct lttng_event_notifier_notification {
+       uint64_t tracer_token;
+       enum lttng_domain_type type;
+};
+
 struct notification_client_list_element {
        struct notification_client *client;
        struct cds_list_head node;
@@ -239,4 +248,13 @@ int notification_thread_client_communication_update(
                notification_client_id id,
                enum client_transmission_status transmission_status);
 
+LTTNG_HIDDEN
+struct lttng_event_notifier_notification *lttng_event_notifier_notification_create(
+               uint64_t tracer_token,
+               enum lttng_domain_type domain);
+
+LTTNG_HIDDEN
+void lttng_event_notifier_notification_destroy(
+               struct lttng_event_notifier_notification *event_notifier_notification);
+
 #endif /* NOTIFICATION_THREAD_INTERNAL_H */