Fix: tests: fix unused-but-set warning in test_fd_tracker.c

[lttng-tools.git] / src / bin / lttng-sessiond / notification-thread-commands.c

diff --git a/src/bin/lttng-sessiond/notification-thread-commands.c b/src/bin/lttng-sessiond/notification-thread-commands.c
index 44bee3d3ba6f634e4fe14db72db3e612ead6a5d6..2908ccb76d3cdee0ade33cee9ccbd9b2c5d9e850 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -111,18 +111,21 @@ error:
 
 enum lttng_error_code notification_thread_command_register_trigger(
                struct notification_thread_handle *handle,
-               struct lttng_trigger *trigger)
+               struct lttng_trigger *trigger,
+               bool is_trigger_anonymous)
 {
        int ret;
        enum lttng_error_code ret_code;
        struct notification_thread_command cmd = {};
 
-       assert(trigger);
+       LTTNG_ASSERT(trigger);
        init_notification_thread_command(&cmd);
 
        cmd.type = NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER;
        lttng_trigger_get(trigger);
        cmd.parameters.register_trigger.trigger = trigger;
+       cmd.parameters.register_trigger.is_trigger_anonymous =
+                       is_trigger_anonymous;
 
        ret = run_command_wait(handle, &cmd);
        if (ret) {
@@ -279,7 +282,7 @@ enum lttng_error_code notification_thread_command_add_tracer_event_source(
        enum lttng_error_code ret_code;
        struct notification_thread_command cmd = {};
 
-       assert(tracer_event_source_fd >= 0);
+       LTTNG_ASSERT(tracer_event_source_fd >= 0);
 
        init_notification_thread_command(&cmd);
 
@@ -333,8 +336,8 @@ enum lttng_error_code notification_thread_command_list_triggers(
        enum lttng_error_code ret_code;
        struct notification_thread_command cmd = {};
 
-       assert(handle);
-       assert(triggers);
+       LTTNG_ASSERT(handle);
+       LTTNG_ASSERT(triggers);
 
        init_notification_thread_command(&cmd);
 
@@ -364,7 +367,7 @@ void notification_thread_command_quit(
 
        cmd.type = NOTIFICATION_COMMAND_TYPE_QUIT;
        ret = run_command_wait(handle, &cmd);
-       assert(!ret && cmd.reply_code == LTTNG_OK);
+       LTTNG_ASSERT(!ret && cmd.reply_code == LTTNG_OK);
 }
 
 int notification_thread_client_communication_update(
@@ -382,30 +385,61 @@ int notification_thread_client_communication_update(
        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)
+enum lttng_error_code notification_thread_command_get_trigger(
+               struct notification_thread_handle *handle,
+               const struct lttng_trigger *trigger,
+               struct lttng_trigger **real_trigger)
+{
+       int ret;
+       enum lttng_error_code ret_code;
+       struct notification_thread_command cmd = {};
+
+       init_notification_thread_command(&cmd);
+
+       cmd.type = NOTIFICATION_COMMAND_TYPE_GET_TRIGGER;
+       cmd.parameters.get_trigger.trigger = trigger;
+       ret = run_command_wait(handle, &cmd);
+       if (ret) {
+               ret_code = LTTNG_ERR_UNK;
+               goto end;
+       }
+
+       ret_code = cmd.reply_code;
+       *real_trigger = cmd.reply.get_trigger.trigger;
+
+end:
+       return ret_code;
+}
+
+/*
+ * Takes ownership of the payload if present.
+ */
+struct lttng_event_notifier_notification *lttng_event_notifier_notification_create(
+               uint64_t tracer_token,
+               enum lttng_domain_type domain,
+               char *payload,
+               size_t payload_size)
 {
        struct lttng_event_notifier_notification *notification = NULL;
 
-       assert(domain != LTTNG_DOMAIN_NONE);
+       LTTNG_ASSERT(domain != LTTNG_DOMAIN_NONE);
+       LTTNG_ASSERT((payload && payload_size) || (!payload && !payload_size));
 
-       notification = zmalloc(
-                       sizeof(struct lttng_event_notifier_notification));
+       notification = zmalloc(sizeof(struct lttng_event_notifier_notification));
        if (notification == NULL) {
-               ERR("[notification-thread] Error allocating notification");
+               ERR("Error allocating notification");
                goto end;
        }
 
        notification->tracer_token = tracer_token;
        notification->type = domain;
+       notification->capture_buffer = payload;
+       notification->capture_buf_size = payload_size;
 
 end:
        return notification;
 }
 
-LTTNG_HIDDEN
 void lttng_event_notifier_notification_destroy(
                struct lttng_event_notifier_notification *notification)
 {
@@ -413,5 +447,6 @@ void lttng_event_notifier_notification_destroy(
                return;
        }
 
+       free(notification->capture_buffer);
        free(notification);
 }