sessiond: Remove [.*-thread] logging prefix
[lttng-tools.git] / src / bin / lttng-sessiond / rotation-thread.c
index 31e65113654c72258592f0d10bc64fc8f0364f90..89a148a74c2bdd1393bb274afb4ae9f0f545caa1 100644 (file)
@@ -252,7 +252,7 @@ int init_poll_set(struct lttng_poll_event *poll_set,
                        lttng_pipe_get_readfd(handle->quit_pipe),
                        LPOLLIN | LPOLLERR);
        if (ret < 0) {
-               ERR("[rotation-thread] Failed to add quit pipe read fd to poll set");
+               ERR("Failed to add quit pipe read fd to poll set");
                goto error;
        }
 
@@ -260,7 +260,7 @@ int init_poll_set(struct lttng_poll_event *poll_set,
                        lttng_pipe_get_readfd(handle->rotation_timer_queue->event_pipe),
                        LPOLLIN | LPOLLERR);
        if (ret < 0) {
-               ERR("[rotation-thread] Failed to add rotate_pending fd to poll set");
+               ERR("Failed to add rotate_pending fd to poll set");
                goto error;
        }
 
@@ -290,21 +290,21 @@ int init_thread_state(struct rotation_thread_handle *handle,
 
        ret = init_poll_set(&state->events, handle);
        if (ret) {
-               ERR("[rotation-thread] Failed to initialize rotation thread poll set");
+               ERR("Failed to initialize rotation thread poll set");
                goto end;
        }
 
        rotate_notification_channel = lttng_notification_channel_create(
                        lttng_session_daemon_notification_endpoint);
        if (!rotate_notification_channel) {
-               ERR("[rotation-thread] Could not create notification channel");
+               ERR("Could not create notification channel");
                ret = -1;
                goto end;
        }
        ret = lttng_poll_add(&state->events, rotate_notification_channel->socket,
                        LPOLLIN | LPOLLERR);
        if (ret < 0) {
-               ERR("[rotation-thread] Failed to add notification fd to pollset");
+               ERR("Failed to add notification fd to pollset");
                goto end;
        }
 
@@ -398,7 +398,7 @@ end:
                                session->chunk_being_archived,
                                &chunk_being_archived_id);
                assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
-               DBG("[rotation-thread] Rotation of trace archive %" PRIu64 " of session \"%s\" is complete on all consumers",
+               DBG("Rotation of trace archive %" PRIu64 " of session \"%s\" is complete on all consumers",
                                chunk_being_archived_id,
                                session->name);
        }
@@ -438,7 +438,7 @@ int check_session_rotation_pending(struct ltt_session *session,
                        &chunk_being_archived_id);
        assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
 
-       DBG("[rotation-thread] Checking for pending rotation on session \"%s\", trace archive %" PRIu64,
+       DBG("Checking for pending rotation on session \"%s\", trace archive %" PRIu64,
                        session->name, chunk_being_archived_id);
 
        /*
@@ -486,7 +486,7 @@ int check_session_rotation_pending(struct ltt_session *session,
                                session->last_archived_chunk_id.value,
                                location);
                if (ret != LTTNG_OK) {
-                       ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
+                       ERR("Failed to notify notification thread of completed rotation for session %s",
                                        session->name);
                }
        }
@@ -499,7 +499,7 @@ check_ongoing_rotation:
                                &chunk_being_archived_id);
                assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
 
-               DBG("[rotation-thread] Rotation of trace archive %" PRIu64 " is still pending for session %s",
+               DBG("Rotation of trace archive %" PRIu64 " is still pending for session %s",
                                chunk_being_archived_id, session->name);
                ret = timer_session_rotation_pending_check_start(session,
                                DEFAULT_ROTATE_PENDING_TIMER);
@@ -521,17 +521,17 @@ int launch_session_rotation(struct ltt_session *session)
        int ret;
        struct lttng_rotate_session_return rotation_return;
 
-       DBG("[rotation-thread] Launching scheduled time-based rotation on session \"%s\"",
+       DBG("Launching scheduled time-based rotation on session \"%s\"",
                        session->name);
 
        ret = cmd_rotate_session(session, &rotation_return, false,
                LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
        if (ret == LTTNG_OK) {
-               DBG("[rotation-thread] Scheduled time-based rotation successfully launched on session \"%s\"",
+               DBG("Scheduled time-based rotation successfully launched on session \"%s\"",
                                session->name);
        } else {
                /* Don't consider errors as fatal. */
-               DBG("[rotation-thread] Scheduled time-based rotation aborted for session %s: %s",
+               DBG("Scheduled time-based rotation aborted for session %s: %s",
                                session->name, lttng_strerror(ret));
        }
        return 0;
@@ -582,7 +582,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
                session_lock_list();
                session = job->session;
                if (!session) {
-                       DBG("[rotation-thread] Session \"%s\" not found",
+                       DBG("Session \"%s\" not found",
                                        session->name);
                        /*
                         * This is a non-fatal error, and we cannot report it to
@@ -635,7 +635,7 @@ int handle_condition(const struct lttng_condition *condition,
 
        if (condition_type != LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE) {
                ret = -1;
-               ERR("[rotation-thread] Condition type and session usage type are not the same");
+               ERR("Condition type and session usage type are not the same");
                goto end;
        }
 
@@ -643,14 +643,14 @@ int handle_condition(const struct lttng_condition *condition,
        condition_status = lttng_condition_session_consumed_size_get_session_name(
                        condition, &condition_session_name);
        if (condition_status != LTTNG_CONDITION_STATUS_OK) {
-               ERR("[rotation-thread] Session name could not be fetched");
+               ERR("Session name could not be fetched");
                ret = -1;
                goto end;
        }
        evaluation_status = lttng_evaluation_session_consumed_size_get_consumed_size(evaluation,
                        &consumed);
        if (evaluation_status != LTTNG_EVALUATION_STATUS_OK) {
-               ERR("[rotation-thread] Failed to get evaluation");
+               ERR("Failed to get evaluation");
                ret = -1;
                goto end;
        }
@@ -660,7 +660,7 @@ int handle_condition(const struct lttng_condition *condition,
        if (!session) {
                ret = -1;
                session_unlock_list();
-               ERR("[rotation-thread] Session \"%s\" not found",
+               ERR("Session \"%s\" not found",
                                condition_session_name);
                goto end;
        }
@@ -677,7 +677,7 @@ int handle_condition(const struct lttng_condition *condition,
        if (ret == -LTTNG_ERR_ROTATION_PENDING) {
                DBG("Rotate already pending, subscribe to the next threshold value");
        } else if (ret != LTTNG_OK) {
-               ERR("[rotation-thread] Failed to rotate on size notification with error: %s",
+               ERR("Failed to rotate on size notification with error: %s",
                                lttng_strerror(ret));
                ret = -1;
                goto end_unlock;
@@ -686,7 +686,7 @@ int handle_condition(const struct lttng_condition *condition,
                        consumed + session->rotate_size,
                        notification_thread_handle);
        if (ret) {
-               ERR("[rotation-thread] Failed to subscribe to session consumed size condition");
+               ERR("Failed to subscribe to session consumed size condition");
                goto end_unlock;
        }
        ret = 0;
@@ -714,7 +714,7 @@ int handle_notification_channel(int fd,
        status = lttng_notification_channel_has_pending_notification(
                        rotate_notification_channel, &notification_pending);
        if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
-               ERR("[rotation-thread] Error occurred while checking for pending notification");
+               ERR("Error occurred while checking for pending notification");
                ret = -1;
                goto end;
        }
@@ -766,14 +766,14 @@ void *thread_rotation(void *data)
        struct rotation_thread thread;
        int queue_pipe_fd;
 
-       DBG("[rotation-thread] Started rotation thread");
+       DBG("Started rotation thread");
        rcu_register_thread();
        rcu_thread_online();
        health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
        health_code_update();
 
        if (!handle) {
-               ERR("[rotation-thread] Invalid thread context provided");
+               ERR("Invalid thread context provided");
                goto end;
        }
 
@@ -790,9 +790,9 @@ void *thread_rotation(void *data)
                int fd_count, i;
 
                health_poll_entry();
-               DBG("[rotation-thread] Entering poll wait");
+               DBG("Entering poll wait");
                ret = lttng_poll_wait(&thread.events, -1);
-               DBG("[rotation-thread] Poll wait returned (%i)", ret);
+               DBG("Poll wait returned (%i)", ret);
                health_poll_exit();
                if (ret < 0) {
                        /*
@@ -801,7 +801,7 @@ void *thread_rotation(void *data)
                        if (errno == EINTR) {
                                continue;
                        }
-                       ERR("[rotation-thread] Error encountered during lttng_poll_wait (%i)", ret);
+                       ERR("Error encountered during lttng_poll_wait (%i)", ret);
                        goto error;
                }
 
@@ -810,11 +810,11 @@ void *thread_rotation(void *data)
                        int fd = LTTNG_POLL_GETFD(&thread.events, i);
                        uint32_t revents = LTTNG_POLL_GETEV(&thread.events, i);
 
-                       DBG("[rotation-thread] Handling fd (%i) activity (%u)",
+                       DBG("Handling fd (%i) activity (%u)",
                                        fd, revents);
 
                        if (revents & LPOLLERR) {
-                               ERR("[rotation-thread] Polling returned an error on fd %i", fd);
+                               ERR("Polling returned an error on fd %i", fd);
                                goto error;
                        }
 
@@ -822,7 +822,7 @@ void *thread_rotation(void *data)
                                ret = handle_notification_channel(fd, handle,
                                                &thread);
                                if (ret) {
-                                       ERR("[rotation-thread] Error occurred while handling activity on notification channel socket");
+                                       ERR("Error occurred while handling activity on notification channel socket");
                                        goto error;
                                }
                        } else {
@@ -837,7 +837,7 @@ void *thread_rotation(void *data)
                                ret = handle_job_queue(handle, &thread,
                                                handle->rotation_timer_queue);
                                if (ret) {
-                                       ERR("[rotation-thread] Failed to handle rotation timer pipe event");
+                                       ERR("Failed to handle rotation timer pipe event");
                                        goto error;
                                }
 
@@ -846,11 +846,11 @@ void *thread_rotation(void *data)
 
                                        ret = lttng_read(fd, &buf, 1);
                                        if (ret != 1) {
-                                               ERR("[rotation-thread] Failed to read from wakeup pipe (fd = %i)", fd);
+                                               ERR("Failed to read from wakeup pipe (fd = %i)", fd);
                                                goto error;
                                        }
                                } else {
-                                       DBG("[rotation-thread] Quit pipe activity");
+                                       DBG("Quit pipe activity");
                                        goto exit;
                                }
                        }
@@ -858,7 +858,7 @@ void *thread_rotation(void *data)
        }
 exit:
 error:
-       DBG("[rotation-thread] Exit");
+       DBG("Thread exit");
        fini_thread_state(&thread);
 end:
        health_unregister(the_health_sessiond);
This page took 0.027802 seconds and 4 git commands to generate.