struct ltt_session *session)
{
int ret;
- const char * const dummy = "!";
+ const char dummy = '!';
struct rotation_thread_job *job = NULL;
const char *job_type_str = get_job_type_str(job_type);
job->type = job_type;
cds_list_add_tail(&job->head, &queue->list);
- ret = lttng_write(lttng_pipe_get_writefd(queue->event_pipe), dummy,
- 1);
+ ret = lttng_write(lttng_pipe_get_writefd(queue->event_pipe), &dummy,
+ sizeof(dummy));
if (ret < 0) {
/*
* We do not want to block in the timer handler, the job has
check_session_rotation_pending_on_consumers(session,
&rotation_completed);
-
if (!rotation_completed ||
session->rotation_state == LTTNG_ROTATION_STATE_ERROR) {
goto end;
}
session_reset_rotation_state(session, LTTNG_ROTATION_STATE_COMPLETED);
- location = session_get_trace_archive_location(session);
- /* Ownership of location is transferred. */
- ret = notification_thread_command_session_rotation_completed(
- notification_thread_handle,
- session->name,
- session->uid,
- session->gid,
- session->last_archived_chunk_id.value,
- location);
- if (ret != LTTNG_OK) {
- ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
- session->name);
+ if (!session->quiet_rotation) {
+ location = session_get_trace_archive_location(session);
+ /* Ownership of location is transferred. */
+ ret = notification_thread_command_session_rotation_completed(
+ notification_thread_handle,
+ session->name,
+ session->uid,
+ session->gid,
+ session->last_archived_chunk_id.value,
+ location);
+ if (ret != LTTNG_OK) {
+ ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
+ session->name);
+ }
}
- if (!session->active) {
+ if (!session->active && !session->quiet_rotation) {
/*
* A stop command was issued during the rotation, it is
* up to the rotation completion check to perform the
DBG("[rotation-thread] Launching scheduled time-based rotation on session \"%s\"",
session->name);
- ret = cmd_rotate_session(session, &rotation_return);
+ ret = cmd_rotate_session(session, &rotation_return, false);
if (ret == LTTNG_OK) {
DBG("[rotation-thread] Scheduled time-based rotation successfully launched on session \"%s\"",
session->name);
goto end_unlock;
}
- ret = cmd_rotate_session(session, NULL);
+ ret = cmd_rotate_session(session, NULL, false);
if (ret == -LTTNG_ERR_ROTATION_PENDING) {
DBG("Rotate already pending, subscribe to the next threshold value");
} else if (ret != LTTNG_OK) {
ret = lttng_read(fd, &buf, 1);
if (ret != 1) {
ERR("[rotation-thread] Failed to read from wakeup pipe (fd = %i)", fd);
- ret = -1;
goto error;
}
} else {