X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=31e65113654c72258592f0d10bc64fc8f0364f90;hb=5c5373c3cbfebddb0068fe13600766bb381048da;hp=659d8431dd39aec39dbcd7cba7eac3d4927b1ace;hpb=2c0c9bbc39323735300b285d2c8a596eeaeb5c15;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 659d8431d..31e651136 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -1,19 +1,9 @@
 /*
- * Copyright (C) 2017 - Julien Desfossez <jdesfossez@efficios.com>
- * Copyright (C) 2018 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2018 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License, version 2 only, as
- * published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -26,7 +16,6 @@
 #include <common/align.h>
 #include <common/time.h>
 #include <common/hashtable/utils.h>
-#include <sys/eventfd.h>
 #include <sys/stat.h>
 #include <time.h>
 #include <signal.h>
@@ -362,13 +351,13 @@ void check_session_rotation_pending_on_consumers(struct ltt_session *session,
 			goto end;
 		}
 
-                if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
+		if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
 			pthread_mutex_unlock(socket->lock);
 			chunk_exists_on_peer = true;
 			goto end;
-                }
+		}
 		pthread_mutex_unlock(socket->lock);
-        }
+	}
 
 skip_ust:
 	if (!session->kernel_session) {
@@ -391,11 +380,11 @@ skip_ust:
 			goto end;
 		}
 
-                if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
+		if (exists_status != CONSUMER_TRACE_CHUNK_EXISTS_STATUS_UNKNOWN_CHUNK) {
 			pthread_mutex_unlock(socket->lock);
 			chunk_exists_on_peer = true;
 			goto end;
-                }
+		}
 		pthread_mutex_unlock(socket->lock);
 	}
 skip_kernel:
@@ -505,8 +494,6 @@ int check_session_rotation_pending(struct ltt_session *session,
 	ret = 0;
 check_ongoing_rotation:
 	if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
-		uint64_t chunk_being_archived_id;
-
 		chunk_status = lttng_trace_chunk_get_id(
 				session->chunk_being_archived,
 				&chunk_being_archived_id);
@@ -537,7 +524,8 @@ int launch_session_rotation(struct ltt_session *session)
 	DBG("[rotation-thread] Launching scheduled time-based rotation on session \"%s\"",
 			session->name);
 
-	ret = cmd_rotate_session(session, &rotation_return, false);
+	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\"",
 				session->name);
@@ -557,7 +545,7 @@ int run_job(struct rotation_thread_job *job, struct ltt_session *session,
 
 	switch (job->type) {
 	case ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION:
-	        ret = launch_session_rotation(session);
+		ret = launch_session_rotation(session);
 		break;
 	case ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION:
 		ret = check_session_rotation_pending(session,
@@ -613,7 +601,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 		}
 
 		session_lock(session);
-	        ret = run_job(job, session, handle->notification_thread_handle);
+		ret = run_job(job, session, handle->notification_thread_handle);
 		session_unlock(session);
 		/* Release reference held by the job. */
 		session_put(session);
@@ -684,7 +672,8 @@ int handle_condition(const struct lttng_condition *condition,
 		goto end_unlock;
 	}
 
-	ret = cmd_rotate_session(session, NULL, false);
+	ret = cmd_rotate_session(session, NULL, false,
+		LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
 	if (ret == -LTTNG_ERR_ROTATION_PENDING) {
 		DBG("Rotate already pending, subscribe to the next threshold value");
 	} else if (ret != LTTNG_OK) {
@@ -725,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("[rotation-thread] Error occurred while checking for pending notification");
 		ret = -1;
 		goto end;
 	}
@@ -780,7 +769,7 @@ void *thread_rotation(void *data)
 	DBG("[rotation-thread] Started rotation thread");
 	rcu_register_thread();
 	rcu_thread_online();
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
+	health_register(the_health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
 	health_code_update();
 
 	if (!handle) {
@@ -872,7 +861,7 @@ error:
 	DBG("[rotation-thread] Exit");
 	fini_thread_state(&thread);
 end:
-	health_unregister(health_sessiond);
+	health_unregister(the_health_sessiond);
 	rcu_thread_offline();
 	rcu_unregister_thread();
 	return NULL;