X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=54a3cc62db9f8bd407561c1b465dde61f6c9eb0d;hp=fcbd83fb37b53e60c0bfe7fa47133b09b4f70d48;hb=343defc2671db532be8a9eed84907fd2e4044f0e;hpb=8c9211169fda5c183b0cf1f94c01721fdb5ccba5

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index fcbd83fb3..54a3cc62d 100644
--- 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)
 {
@@ -564,7 +537,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);
@@ -711,7 +685,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) {
@@ -796,6 +771,7 @@ end:
 	return ret;
 }
 
+static
 void *thread_rotation(void *data)
 {
 	int ret;