From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Tue, 3 Apr 2018 14:07:32 +0000 (-0400)
Subject: Add initial "no rotation" state to session rotation states
X-Git-Tag: v2.11.0-rc1~314
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=4f23c58345539eee2e44ae370c31dd6202de2d58;p=lttng-tools.git

Add initial "no rotation" state to session rotation states

ltt_session structures are initialized in the
LTTNG_ROTATION_sTATE_COMPLETED state which is unexpected for
users of the get_info API.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/include/lttng/rotation.h b/include/lttng/rotation.h
index 00d68d7e5..0b4b2ad2f 100644
--- a/include/lttng/rotation.h
+++ b/include/lttng/rotation.h
@@ -29,15 +29,19 @@ extern "C" {
  * Return codes for lttng_rotation_handle_get_state()
  */
 enum lttng_rotation_state {
+	/*
+	 * Session has not been rotated.
+	 */
+	LTTNG_ROTATION_STATE_NO_ROTATION = 0,
 	/*
 	 * Rotation is ongoing, but has not been completed yet.
 	 */
-	LTTNG_ROTATION_STATE_ONGOING = 0,
+	LTTNG_ROTATION_STATE_ONGOING = 1,
 	/*
 	 * Rotation has been completed and the resulting chunk
 	 * can now safely be read.
 	 */
-	LTTNG_ROTATION_STATE_COMPLETED = 1,
+	LTTNG_ROTATION_STATE_COMPLETED = 2,
 	/*
 	 * The rotation has expired.
 	 *
@@ -48,11 +52,11 @@ enum lttng_rotation_state {
 	 * Note that this state does not guarantee the the rotation was
 	 * completed successfully.
 	 */
-	LTTNG_ROTATION_STATE_EXPIRED = 2,
+	LTTNG_ROTATION_STATE_EXPIRED = 3,
 	/*
 	 * The rotation could not be completed due to an error.
 	 */
-	LTTNG_ROTATION_STATE_ERROR = 3,
+	LTTNG_ROTATION_STATE_ERROR = 4,
 };
 
 enum lttng_rotation_status {
diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 39c5611d7..2b7d65eaa 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -401,6 +401,7 @@ int session_create(char *name, uid_t uid, gid_t gid)
 	}
 
 	new_session->rotate_pending = false;
+	new_session->rotation_state = LTTNG_ROTATION_STATE_NO_ROTATION;
 	new_session->rotate_pending_relay = false;
 	new_session->rotate_relay_pending_timer_enabled = false;
 	new_session->rotate_timer = false;