X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=e88d7a2f77eb41534062fbe01dbe990d11f65855;hb=90936dcf0968343f20b2f6fd365b9c015cdb9717;hp=5377ad8ee7ea44fced57db158ae85d9d8ddec044;hpb=d68c9a04537b683991a7355b812b0af954008cf1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 5377ad8ee..e88d7a2f7 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2579,6 +2579,16 @@ int cmd_start_trace(struct ltt_session *session)
 	 */
 	session->rotated_after_last_stop = false;
 
+	if (session->rotate_timer_period) {
+		ret = sessiond_rotate_timer_start(session,
+				session->rotate_timer_period);
+		if (ret < 0) {
+			ERR("Failed to enable rotate timer");
+			ret = LTTNG_ERR_UNK;
+			goto error;
+		}
+	}
+
 	ret = LTTNG_OK;
 
 error:
@@ -2655,6 +2665,10 @@ int cmd_stop_trace(struct ltt_session *session)
 		sessiond_timer_rotate_pending_stop(session);
 	}
 
+	if (session->rotate_timer_enabled) {
+		sessiond_rotate_timer_stop(session);
+	}
+
 	if (session->rotate_count > 0 && !session->rotate_pending) {
 		ret = rename_active_chunk(session);
 		if (ret) {
@@ -2939,7 +2953,8 @@ error:
  *
  * Called with session lock held.
  */
-int cmd_destroy_session(struct ltt_session *session, int wpipe)
+int cmd_destroy_session(struct ltt_session *session, int wpipe,
+		struct notification_thread_handle *notification_thread_handle)
 {
 	int ret;
 	struct ltt_ust_session *usess;
@@ -2957,6 +2972,15 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe)
 		sessiond_timer_rotate_pending_stop(session);
 	}
 
+	if (session->rotate_timer_enabled) {
+		sessiond_rotate_timer_stop(session);
+	}
+
+	if (session->rotate_size) {
+		unsubscribe_session_consumed_size_rotation(session, notification_thread_handle);
+		session->rotate_size = 0;
+	}
+
 	/*
 	 * The rename of the current chunk is performed at stop, but if we rotated
 	 * the session after the previous stop command, we need to rename the
@@ -4359,7 +4383,7 @@ int cmd_rotate_session(struct ltt_session *session,
 	int ret;
 	size_t strf_ret;
 	struct tm *timeinfo;
-	char datetime[16];
+	char datetime[21];
 	time_t now;
 	bool ust_active = false;
 
@@ -4461,7 +4485,7 @@ int cmd_rotate_session(struct ltt_session *session,
 		ret = -LTTNG_ERR_UNK;
 		goto end;
 	}
-	strf_ret = strftime(datetime, sizeof(datetime), "%Y%m%d-%H%M%S",
+	strf_ret = strftime(datetime, sizeof(datetime), "%Y%m%dT%H%M%S%z",
 			timeinfo);
 	if (!strf_ret) {
 		ERR("Failed to format local time timestamp in rotate session command");
@@ -4570,7 +4594,7 @@ int cmd_rotate_session(struct ltt_session *session,
 		rotate_return->rotation_id = session->rotate_count;
 	}
 
-	DBG("Cmd rotate session %s, rotate_id %" PRIu64 " completed", session->name,
+	DBG("Cmd rotate session %s, rotate_id %" PRIu64 " sent", session->name,
 			session->rotate_count);
 	ret = LTTNG_OK;
 
@@ -4632,6 +4656,101 @@ end:
 	return ret;
 }
 
+/*
+ * Command LTTNG_ROTATION_SET_SCHEDULE from the lttng-ctl library.
+ *
+ * Configure the automatic rotation parameters.
+ * Set to -1ULL to disable them.
+ *
+ * Return 0 on success or else an LTTNG_ERR code.
+ */
+int cmd_rotation_set_schedule(struct ltt_session *session,
+		uint64_t timer_us, uint64_t size,
+		struct notification_thread_handle *notification_thread_handle)
+{
+	int ret;
+
+	assert(session);
+
+	DBG("Cmd rotate set schedule session %s", session->name);
+
+	if (session->live_timer || session->snapshot_mode ||
+			!session->output_traces) {
+		ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE;
+		goto end;
+	}
+
+	/* Trying to override an already active timer. */
+	if (timer_us && timer_us != -1ULL && session->rotate_timer_period) {
+		ret = LTTNG_ERR_ROTATION_TIMER_SET;
+		goto end;
+	/* Trying to disable an inactive timer. */
+	} else if (timer_us == -1ULL && !session->rotate_timer_period) {
+		ret = LTTNG_ERR_ROTATION_NO_TIMER_SET;
+		goto end;
+	}
+
+	if (size && size != -1ULL && session->rotate_size) {
+		ret = LTTNG_ERR_ROTATION_SIZE_SET;
+		goto end;
+	} else if (size == -1ULL && !session->rotate_size) {
+		ret = LTTNG_ERR_ROTATION_NO_SIZE_SET;
+		goto end;
+	}
+
+	if (timer_us && !session->rotate_timer_period) {
+		if (timer_us > UINT_MAX) {
+			ret = LTTNG_ERR_INVALID;
+			goto end;
+		}
+
+		session->rotate_timer_period = timer_us;
+		/*
+		 * Only start the timer if the session is active, otherwise
+		 * it will be started when the session starts.
+		 */
+		if (session->active) {
+			ret = sessiond_rotate_timer_start(session, timer_us);
+			if (ret) {
+				ERR("Failed to enable rotate timer");
+				ret = LTTNG_ERR_UNK;
+				goto end;
+			}
+		}
+	} else if (timer_us == -1ULL && session->rotate_timer_period > 0) {
+		sessiond_rotate_timer_stop(session);
+		session->rotate_timer_period = 0;
+	}
+
+	if (size > 0) {
+		if (size == -1ULL) {
+			ret = unsubscribe_session_consumed_size_rotation(session,
+					notification_thread_handle);
+			if (ret) {
+				ret = LTTNG_ERR_UNK;
+				goto end;
+			}
+			session->rotate_size = 0;
+		} else {
+			ret = subscribe_session_consumed_size_rotation(session,
+					size, notification_thread_handle);
+			if (ret) {
+				PERROR("Subscribe to session usage");
+				ret = LTTNG_ERR_UNK;
+				goto end;
+			}
+			session->rotate_size = size;
+		}
+	}
+
+	ret = LTTNG_OK;
+
+	goto end;
+
+end:
+	return ret;
+}
+
 /*
  * Command ROTATE_GET_CURRENT_PATH from the lttng-ctl library.
  *