Implements `lttng_event_notifier_notification_{create,destroy}()`

[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 dc03e6a2df2fd9e7eab8634b5ece6ebb557c91de..44bee3d3ba6f634e4fe14db72db3e612ead6a5d6 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -117,10 +117,12 @@ enum lttng_error_code notification_thread_command_register_trigger(
        enum lttng_error_code ret_code;
        struct notification_thread_command cmd = {};
 
        enum lttng_error_code ret_code;
        struct notification_thread_command cmd = {};
 

+       assert(trigger);

        init_notification_thread_command(&cmd);
 
        cmd.type = NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER;
        init_notification_thread_command(&cmd);
 
        cmd.type = NOTIFICATION_COMMAND_TYPE_REGISTER_TRIGGER;

-       cmd.parameters.trigger = trigger;
+       lttng_trigger_get(trigger);
+       cmd.parameters.register_trigger.trigger = trigger;

 
        ret = run_command_wait(handle, &cmd);
        if (ret) {
 
        ret = run_command_wait(handle, &cmd);
        if (ret) {


@@ -134,7 +136,7 @@ end:
 
 enum lttng_error_code notification_thread_command_unregister_trigger(
                struct notification_thread_handle *handle,
 
 enum lttng_error_code notification_thread_command_unregister_trigger(
                struct notification_thread_handle *handle,

-               struct lttng_trigger *trigger)
+               const struct lttng_trigger *trigger)

 {
        int ret;
        enum lttng_error_code ret_code;
 {
        int ret;
        enum lttng_error_code ret_code;


@@ -143,7 +145,7 @@ enum lttng_error_code notification_thread_command_unregister_trigger(
        init_notification_thread_command(&cmd);
 
        cmd.type = NOTIFICATION_COMMAND_TYPE_UNREGISTER_TRIGGER;
        init_notification_thread_command(&cmd);
 
        cmd.type = NOTIFICATION_COMMAND_TYPE_UNREGISTER_TRIGGER;

-       cmd.parameters.trigger = trigger;
+       cmd.parameters.unregister_trigger.trigger = trigger;

 
        ret = run_command_wait(handle, &cmd);
        if (ret) {
 
        ret = run_command_wait(handle, &cmd);
        if (ret) {


@@ -268,6 +270,90 @@ end:
        return ret_code;
 }
 
        return ret_code;
 }
 

+enum lttng_error_code notification_thread_command_add_tracer_event_source(
+               struct notification_thread_handle *handle,
+               int tracer_event_source_fd,
+               enum lttng_domain_type domain)
+{
+       int ret;
+       enum lttng_error_code ret_code;
+       struct notification_thread_command cmd = {};
+
+       assert(tracer_event_source_fd >= 0);
+
+       init_notification_thread_command(&cmd);
+
+       cmd.type = NOTIFICATION_COMMAND_TYPE_ADD_TRACER_EVENT_SOURCE;
+       cmd.parameters.tracer_event_source.tracer_event_source_fd =
+                       tracer_event_source_fd;
+       cmd.parameters.tracer_event_source.domain = domain;
+
+       ret = run_command_wait(handle, &cmd);
+       if (ret) {
+               ret_code = LTTNG_ERR_UNK;
+               goto end;
+       }
+
+       ret_code = cmd.reply_code;
+end:
+       return ret_code;
+}
+
+enum lttng_error_code notification_thread_command_remove_tracer_event_source(
+               struct notification_thread_handle *handle,
+               int tracer_event_source_fd)
+{
+       int ret;
+       enum lttng_error_code ret_code;
+       struct notification_thread_command cmd = {};
+
+       init_notification_thread_command(&cmd);
+
+       cmd.type = NOTIFICATION_COMMAND_TYPE_REMOVE_TRACER_EVENT_SOURCE;
+       cmd.parameters.tracer_event_source.tracer_event_source_fd =
+                       tracer_event_source_fd;
+
+       ret = run_command_wait(handle, &cmd);
+       if (ret) {
+               ret_code = LTTNG_ERR_UNK;
+               goto end;
+       }
+
+       ret_code = cmd.reply_code;
+end:
+       return ret_code;
+}
+
+enum lttng_error_code notification_thread_command_list_triggers(
+               struct notification_thread_handle *handle,
+               uid_t uid,
+               struct lttng_triggers **triggers)
+{
+       int ret;
+       enum lttng_error_code ret_code;
+       struct notification_thread_command cmd = {};
+
+       assert(handle);
+       assert(triggers);
+
+       init_notification_thread_command(&cmd);
+
+       cmd.type = NOTIFICATION_COMMAND_TYPE_LIST_TRIGGERS;
+       cmd.parameters.list_triggers.uid = uid;
+
+       ret = run_command_wait(handle, &cmd);
+       if (ret) {
+               ret_code = LTTNG_ERR_UNK;
+               goto end;
+       }
+
+       ret_code = cmd.reply_code;
+       *triggers = cmd.reply.list_triggers.triggers;
+
+end:
+       return ret_code;
+}
+

 void notification_thread_command_quit(
                struct notification_thread_handle *handle)
 {
 void notification_thread_command_quit(
                struct notification_thread_handle *handle)
 {


@@ -295,3 +381,37 @@ int notification_thread_client_communication_update(
        cmd.parameters.client_communication_update.status = transmission_status;
        return run_command_no_wait(handle, &cmd);
 }
        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);
+}