Fix: sessiond: handle empty scheduled rotations

[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 7f031e7427688e903df292ff0a7da7a1176dc023..64e5d2924e9cbf2d34e62158a365a22f83764ad8 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-commands.c
+++ b/src/bin/lttng-sessiond/notification-thread-commands.c
@@ -33,7 +33,7 @@ int run_command_wait(struct notification_thread_handle *handle,
        cds_list_add_tail(&cmd->cmd_list_node,
                        &handle->cmd_queue.list);
        /* Wake-up thread. */
-       ret = lttng_write(lttng_pipe_get_writefd(handle->cmd_queue.event_pipe),
+       ret = lttng_write(handle->cmd_queue.event_fd,
                        &notification_counter, sizeof(notification_counter));
        if (ret != sizeof(notification_counter)) {
                PERROR("write to notification thread's queue event fd");
@@ -89,7 +89,7 @@ int run_command_no_wait(struct notification_thread_handle *handle,
        cds_list_add_tail(&new_cmd->cmd_list_node,
                        &handle->cmd_queue.list);
        /* Wake-up thread. */
-       ret = lttng_write(lttng_pipe_get_writefd(handle->cmd_queue.event_pipe),
+       ret = lttng_write(handle->cmd_queue.event_fd,
                        &notification_counter, sizeof(notification_counter));
        if (ret != sizeof(notification_counter)) {
                PERROR("write to notification thread's queue event fd");
@@ -111,7 +111,8 @@ 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;
@@ -123,6 +124,8 @@ enum lttng_error_code notification_thread_command_register_trigger(
        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) {
@@ -425,7 +428,7 @@ struct lttng_event_notifier_notification *lttng_event_notifier_notification_crea
 
        notification = zmalloc(sizeof(struct lttng_event_notifier_notification));
        if (notification == NULL) {
-               ERR("[notification-thread] Error allocating notification");
+               ERR("Error allocating notification");
                goto end;
        }