sessiond: make thread_rotation function static

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

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 7bd6c681982fe1c18b6f0b039176650f17d6af2a..659d8431dd39aec39dbcd7cba7eac3d4927b1ace 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -111,33 +111,6 @@ end:
        return queue;
 }
 
-void log_job_destruction(const struct rotation_thread_job *job)
-{
-       enum lttng_error_level log_level;
-       const char *job_type_str = get_job_type_str(job->type);
-
-       switch (job->type) {
-       case ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION:
-               /*
-                * Not a problem, the scheduled rotation is racing with the teardown
-                * of the daemon. In this case, the rotation will not happen, which
-                * is not a problem (or at least, not important enough to delay
-                * the shutdown of the session daemon).
-                */
-               log_level = PRINT_DBG;
-               break;
-       case ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION:
-               /* This is not expected to happen; warn the user. */
-               log_level = PRINT_WARN;
-               break;
-       default:
-               abort();
-       }
-
-       LOG(log_level, "Rotation thread timer queue still contains job of type %s targeting session \"%s\" on destruction",
-                       job_type_str, job->session->name);
-}
-
 void rotation_thread_timer_queue_destroy(
                struct rotation_thread_timer_queue *queue)
 {
@@ -385,7 +358,7 @@ void check_session_rotation_pending_on_consumers(struct ltt_session *session,
                                &exists_status);
                if (ret) {
                        pthread_mutex_unlock(socket->lock);
-                       ERR("Error occured while checking rotation status on consumer daemon");
+                       ERR("Error occurred while checking rotation status on consumer daemon");
                        goto end;
                }
 
@@ -414,7 +387,7 @@ skip_ust:
                                &exists_status);
                if (ret) {
                        pthread_mutex_unlock(socket->lock);
-                       ERR("Error occured while checking rotation status on consumer daemon");
+                       ERR("Error occurred while checking rotation status on consumer daemon");
                        goto end;
                }
 
@@ -467,6 +440,11 @@ int check_session_rotation_pending(struct ltt_session *session,
        const char *archived_chunk_name;
        uint64_t chunk_being_archived_id;
 
+       if (!session->chunk_being_archived) {
+               ret = 0;
+               goto end;
+       }
+
        chunk_status = lttng_trace_chunk_get_id(session->chunk_being_archived,
                        &chunk_being_archived_id);
        assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
@@ -474,11 +452,6 @@ int check_session_rotation_pending(struct ltt_session *session,
        DBG("[rotation-thread] Checking for pending rotation on session \"%s\", trace archive %" PRIu64,
                        session->name, chunk_being_archived_id);
 
-       if (!session->chunk_being_archived) {
-               ret = 0;
-               goto end;
-       }
-
        /*
         * The rotation-pending check timer of a session is launched in
         * one-shot mode. If the rotation is incomplete, the rotation
@@ -489,14 +462,14 @@ int check_session_rotation_pending(struct ltt_session *session,
         */
        ret = timer_session_rotation_pending_check_stop(session);
        if (ret) {
-               goto end;
+               goto check_ongoing_rotation;
        }
 
        check_session_rotation_pending_on_consumers(session,
                        &rotation_completed);
        if (!rotation_completed ||
                        session->rotation_state == LTTNG_ROTATION_STATE_ERROR) {
-               goto end;
+               goto check_ongoing_rotation;
        }
 
        /*
@@ -529,40 +502,8 @@ int check_session_rotation_pending(struct ltt_session *session,
                }
        }
 
-       if (!session->active && !session->quiet_rotation) {
-               /*
-                * A stop command was issued during the rotation, it is
-                * up to the rotation completion check to perform the
-                * renaming of the last chunk that was produced.
-                */
-               ret = notification_thread_command_session_rotation_ongoing(
-                               notification_thread_handle,
-                               session->name,
-                               session->uid,
-                               session->gid,
-                               session->most_recent_chunk_id.value);
-               if (ret != LTTNG_OK) {
-                       ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
-                                       session->name);
-               }
-
-               /* Ownership of location is transferred. */
-               location = session_get_trace_archive_location(session);
-               ret = notification_thread_command_session_rotation_completed(
-                               notification_thread_handle,
-                               session->name,
-                               session->uid,
-                               session->gid,
-                               session->most_recent_chunk_id.value,
-                               location);
-               if (ret != LTTNG_OK) {
-                       ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
-                                       session->name);
-               }
-       }
-
        ret = 0;
-end:
+check_ongoing_rotation:
        if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
                uint64_t chunk_being_archived_id;
 
@@ -582,6 +523,7 @@ end:
                }
        }
 
+end:
        return ret;
 }
 
@@ -827,26 +769,28 @@ end:
        return ret;
 }
 
+static
 void *thread_rotation(void *data)
 {
        int ret;
        struct rotation_thread_handle *handle = data;
        struct rotation_thread thread;
-       const int queue_pipe_fd = lttng_pipe_get_readfd(
-                       handle->rotation_timer_queue->event_pipe);
+       int queue_pipe_fd;
 
        DBG("[rotation-thread] Started rotation thread");
+       rcu_register_thread();
+       rcu_thread_online();
+       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
+       health_code_update();
 
        if (!handle) {
                ERR("[rotation-thread] Invalid thread context provided");
                goto end;
        }
 
-       rcu_register_thread();
-       rcu_thread_online();
+       queue_pipe_fd = lttng_pipe_get_readfd(
+                       handle->rotation_timer_queue->event_pipe);
 
-       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
-       health_code_update();
 
        ret = init_thread_state(handle, &thread);
        if (ret) {
@@ -927,10 +871,10 @@ exit:
 error:
        DBG("[rotation-thread] Exit");
        fini_thread_state(&thread);
+end:
        health_unregister(health_sessiond);
        rcu_thread_offline();
        rcu_unregister_thread();
-end:
        return NULL;
 }