*/
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:
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) {
*
* 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;
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
int ret;
size_t strf_ret;
struct tm *timeinfo;
- char datetime[16];
+ char datetime[21];
time_t now;
bool ust_active = false;
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");
ret = domain_mkdir(session->ust_session->consumer, session,
session->ust_session->uid,
session->ust_session->gid);
+ if (ret) {
+ ret = -LTTNG_ERR_CREATE_DIR_FAIL;
+ goto end;
+ }
ret = ust_app_rotate_session(session, &ust_active);
if (ret != LTTNG_OK) {
- ret = -LTTNG_ERR_CREATE_DIR_FAIL;
goto end;
}
/*
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;
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.
*