X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=7f05655ecd7371a60c6fc3b5b9e1bd9eef768f84;hp=606811e18b791784660b5145d9042b675f38dc31;hb=17dd12323bbd9f979e5b3886f979a1e02e2dcbe6;hpb=5c408ad8ef08a226c018702aca969536f36ac4e5 diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index 606811e18..7f05655ec 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -37,6 +38,7 @@ #include #include #include +#include #include #include "channel.h" @@ -47,7 +49,7 @@ #include "kernel-consumer.h" #include "lttng-sessiond.h" #include "utils.h" -#include "syscall.h" +#include "lttng-syscall.h" #include "agent.h" #include "buffer-registry.h" #include "notification-thread.h" @@ -55,9 +57,34 @@ #include "rotate.h" #include "rotation-thread.h" #include "sessiond-timer.h" +#include "agent-thread.h" #include "cmd.h" +/* Sleep for 100ms between each check for the shm path's deletion. */ +#define SESSION_DESTROY_SHM_PATH_CHECK_DELAY_US 100000 + +static enum lttng_error_code wait_on_path(void *path); + +/* + * Command completion handler that is used by the destroy command + * when a session that has a non-default shm_path is being destroyed. + * + * See comment in cmd_destroy_session() for the rationale. + */ +static struct destroy_completion_handler { + struct cmd_completion_handler handler; + char shm_path[member_sizeof(struct ltt_session, shm_path)]; +} destroy_completion_handler = { + .handler = { + .run = wait_on_path, + .data = destroy_completion_handler.shm_path + }, + .shm_path = { 0 }, +}; + +static struct cmd_completion_handler *current_completion_handler; + /* * Used to keep a unique index for each relayd socket created where this value * is associated with streams on the consumer so it can match the right relayd @@ -917,8 +944,8 @@ error: * * The consumer socket lock must be held by the caller. */ -static int send_consumer_relayd_socket(enum lttng_domain_type domain, - unsigned int session_id, struct lttng_uri *relayd_uri, +static int send_consumer_relayd_socket(unsigned int session_id, + struct lttng_uri *relayd_uri, struct consumer_output *consumer, struct consumer_socket *consumer_sock, char *session_name, char *hostname, int session_live_timer) @@ -1003,7 +1030,7 @@ static int send_consumer_relayd_sockets(enum lttng_domain_type domain, /* Sending control relayd socket. */ if (!sock->control_sock_sent) { - ret = send_consumer_relayd_socket(domain, session_id, + ret = send_consumer_relayd_socket(session_id, &consumer->dst.net.control, consumer, sock, session_name, hostname, session_live_timer); if (ret != LTTNG_OK) { @@ -1013,7 +1040,7 @@ static int send_consumer_relayd_sockets(enum lttng_domain_type domain, /* Sending data relayd socket. */ if (!sock->data_sock_sent) { - ret = send_consumer_relayd_socket(domain, session_id, + ret = send_consumer_relayd_socket(session_id, &consumer->dst.net.data, consumer, sock, session_name, hostname, session_live_timer); if (ret != LTTNG_OK) { @@ -1152,7 +1179,7 @@ static int start_kernel_session(struct ltt_kernel_session *ksess, int wpipe) } /* Quiescent wait after starting trace */ - kernel_wait_quiescent(kernel_tracer_fd); + kernel_wait_quiescent(wpipe); ksess->active = 1; @@ -1384,9 +1411,15 @@ int cmd_enable_channel(struct ltt_session *session, break; } case LTTNG_DOMAIN_UST: + break; case LTTNG_DOMAIN_JUL: case LTTNG_DOMAIN_LOG4J: case LTTNG_DOMAIN_PYTHON: + if (!agent_tracing_is_enabled()) { + DBG("Attempted to enable a channel in an agent domain but the agent thread is not running"); + ret = LTTNG_ERR_AGENT_TRACING_DISABLED; + goto error; + } break; default: ret = LTTNG_ERR_UNKNOWN_DOMAIN; @@ -2094,6 +2127,12 @@ static int _cmd_enable_event(struct ltt_session *session, assert(usess); + if (!agent_tracing_is_enabled()) { + DBG("Attempted to enable an event in an agent domain but the agent thread is not running"); + ret = LTTNG_ERR_AGENT_TRACING_DISABLED; + goto error; + } + agt = trace_ust_find_agent(usess, domain->type); if (!agt) { agt = agent_create(domain->type); @@ -2579,6 +2618,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: @@ -2590,7 +2639,7 @@ int rename_active_chunk(struct ltt_session *session) { int ret; - session->rotate_count++; + session->current_archive_id++; /* * The currently active tracing path is now the folder we @@ -2623,7 +2672,7 @@ int rename_active_chunk(struct ltt_session *session) goto end; } end: - session->rotate_count--; + session->current_archive_id--; return ret; } @@ -2651,7 +2700,15 @@ int cmd_stop_trace(struct ltt_session *session) goto error; } - if (session->rotate_count > 0 && !session->rotate_pending) { + if (session->rotate_relay_pending_timer_enabled) { + sessiond_timer_rotate_pending_stop(session); + } + + if (session->rotate_timer_enabled) { + sessiond_rotate_timer_stop(session); + } + + if (session->current_archive_id > 0 && !session->rotate_pending) { ret = rename_active_chunk(session); if (ret) { /* @@ -2935,7 +2992,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; @@ -2949,6 +3007,19 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe) DBG("Begin destroy session %s (id %" PRIu64 ")", session->name, session->id); + if (session->rotate_relay_pending_timer_enabled) { + 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 @@ -2985,6 +3056,59 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe) PERROR("write kernel poll pipe"); } + if (session->shm_path[0]) { + /* + * When a session is created with an explicit shm_path, + * the consumer daemon will create its shared memory files + * at that location and will *not* unlink them. This is normal + * as the intention of that feature is to make it possible + * to retrieve the content of those files should a crash occur. + * + * To ensure the content of those files can be used, the + * sessiond daemon will replicate the content of the metadata + * cache in a metadata file. + * + * On clean-up, it is expected that the consumer daemon will + * unlink the shared memory files and that the session daemon + * will unlink the metadata file. Then, the session's directory + * in the shm path can be removed. + * + * Unfortunately, a flaw in the design of the sessiond's and + * consumerd's tear down of channels makes it impossible to + * determine when the sessiond _and_ the consumerd have both + * destroyed their representation of a channel. For one, the + * unlinking, close, and rmdir happen in deferred 'call_rcu' + * callbacks in both daemons. + * + * However, it is also impossible for the sessiond to know when + * the consumer daemon is done destroying its channel(s) since + * it occurs as a reaction to the closing of the channel's file + * descriptor. There is no resulting communication initiated + * from the consumerd to the sessiond to confirm that the + * operation is completed (and was successful). + * + * Until this is all fixed, the session daemon checks for the + * removal of the session's shm path which makes it possible + * to safely advertise a session as having been destroyed. + * + * Prior to this fix, it was not possible to reliably save + * a session making use of the --shm-path option, destroy it, + * and load it again. This is because the creation of the + * session would fail upon seeing the session's shm path + * already in existence. + * + * Note that none of the error paths in the check for the + * directory's existence return an error. This is normal + * as there isn't much that can be done. The session will + * be destroyed properly, except that we can't offer the + * guarantee that the same session can be re-created. + */ + current_completion_handler = &destroy_completion_handler.handler; + ret = lttng_strncpy(destroy_completion_handler.shm_path, + session->shm_path, + sizeof(destroy_completion_handler.shm_path)); + assert(!ret); + } ret = session_destroy(session); return ret; @@ -3639,10 +3763,12 @@ static int clear_metadata_file(int fd) { int ret; + off_t lseek_ret; - ret = lseek(fd, 0, SEEK_SET); - if (ret < 0) { + lseek_ret = lseek(fd, 0, SEEK_SET); + if (lseek_ret < 0) { PERROR("lseek"); + ret = -1; goto end; } @@ -4351,7 +4477,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; @@ -4359,13 +4485,13 @@ int cmd_rotate_session(struct ltt_session *session, if (!session->has_been_started) { ret = -LTTNG_ERR_START_SESSION_ONCE; - goto error; + goto end; } if (session->live_timer || session->snapshot_mode || !session->output_traces) { ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE; - goto error; + goto end; } /* @@ -4374,14 +4500,14 @@ int cmd_rotate_session(struct ltt_session *session, if (session->consumer->type == CONSUMER_DST_NET && (session->consumer->relay_major_version == 2 && session->consumer->relay_minor_version < 11)) { - ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE; - goto error; + ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE_RELAY; + goto end; } if (session->rotate_pending || session->rotate_pending_relay) { ret = -LTTNG_ERR_ROTATION_PENDING; DBG("Rotate already in progress"); - goto error; + goto end; } /* @@ -4392,11 +4518,11 @@ int cmd_rotate_session(struct ltt_session *session, DBG("Session \"%s\" was already rotated after stop, refusing rotation", session->name); ret = -LTTNG_ERR_ROTATION_MULTIPLE_AFTER_STOP; - goto error; + goto end; } /* Special case for the first rotation. */ - if (session->rotate_count == 0) { + if (session->current_archive_id == 0) { const char *base_path = NULL; /* Either one of the two sessions is enough to get the root path. */ @@ -4414,7 +4540,7 @@ int cmd_rotate_session(struct ltt_session *session, if (ret) { ERR("Failed to copy session base path to current rotation chunk path"); ret = -LTTNG_ERR_UNK; - goto error; + goto end; } } else { /* @@ -4427,14 +4553,22 @@ int cmd_rotate_session(struct ltt_session *session, if (ret) { ERR("Failed to copy the active tracing path to the current rotate path"); ret = -LTTNG_ERR_UNK; - goto error; + goto end; } } DBG("Current rotate path %s", session->rotation_chunk.current_rotate_path); - session->rotate_count++; + session->current_archive_id++; session->rotate_pending = true; - session->rotation_status = LTTNG_ROTATION_STATUS_STARTED; + session->rotation_state = LTTNG_ROTATION_STATE_ONGOING; + ret = notification_thread_command_session_rotation_ongoing( + notification_thread_handle, + session->name, session->uid, session->gid, + session->current_archive_id); + if (ret != LTTNG_OK) { + ERR("Failed to notify notification thread that a session rotation is ongoing for session %s", + session->name); + } /* * Create the path name for the next chunk. @@ -4442,7 +4576,7 @@ int cmd_rotate_session(struct ltt_session *session, now = time(NULL); if (now == (time_t) -1) { ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE; - goto error; + goto end; } session->last_chunk_start_ts = session->current_chunk_start_ts; session->current_chunk_start_ts = now; @@ -4451,14 +4585,14 @@ int cmd_rotate_session(struct ltt_session *session, if (!timeinfo) { PERROR("Failed to sample local time in rotate session command"); ret = -LTTNG_ERR_UNK; - goto error; + 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 = -LTTNG_ERR_UNK; - goto error; + goto end; } if (session->kernel_session) { /* @@ -4469,11 +4603,11 @@ int cmd_rotate_session(struct ltt_session *session, sizeof(session->rotation_chunk.active_tracing_path), "%s/%s-%" PRIu64, session_get_base_path(session), - datetime, session->rotate_count + 1); + datetime, session->current_archive_id + 1); if (ret < 0 || ret == sizeof(session->rotation_chunk.active_tracing_path)) { ERR("Failed to format active kernel tracing path in rotate session command"); ret = -LTTNG_ERR_UNK; - goto error; + goto end; } /* * The sub-directory for the consumer @@ -4482,11 +4616,11 @@ int cmd_rotate_session(struct ltt_session *session, ret = snprintf(session->kernel_session->consumer->chunk_path, sizeof(session->kernel_session->consumer->chunk_path), "/%s-%" PRIu64, datetime, - session->rotate_count + 1); + session->current_archive_id + 1); if (ret < 0 || ret == sizeof(session->kernel_session->consumer->chunk_path)) { ERR("Failed to format the kernel consumer's sub-directory in rotate session command"); ret = -LTTNG_ERR_UNK; - goto error; + goto end; } /* * Create the new chunk folder, before the rotation begins so we don't @@ -4497,31 +4631,33 @@ int cmd_rotate_session(struct ltt_session *session, session->kernel_session->gid); if (ret) { ERR("Failed to create kernel session tracing path at %s", - session->kernel_session->chunk_path); - goto error; + session->kernel_session->consumer->chunk_path); + ret = -LTTNG_ERR_CREATE_DIR_FAIL; + goto end; } ret = kernel_rotate_session(session); if (ret != LTTNG_OK) { - goto error; + ret = -ret; + goto end; } } if (session->ust_session) { ret = snprintf(session->rotation_chunk.active_tracing_path, PATH_MAX, "%s/%s-%" PRIu64, session_get_base_path(session), - datetime, session->rotate_count + 1); + datetime, session->current_archive_id + 1); if (ret < 0) { ERR("Failed to format active UST tracing path in rotate session command"); ret = -LTTNG_ERR_UNK; - goto error; + goto end; } ret = snprintf(session->ust_session->consumer->chunk_path, PATH_MAX, "/%s-%" PRIu64, datetime, - session->rotate_count + 1); + session->current_archive_id + 1); if (ret < 0) { ERR("Failed to format the UST consumer's sub-directory in rotate session command"); ret = -LTTNG_ERR_UNK; - goto error; + goto end; } /* * Create the new chunk folder, before the rotation begins so we don't @@ -4530,9 +4666,13 @@ int cmd_rotate_session(struct ltt_session *session, 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) { - goto error; + goto end; } /* * Handle the case where we did not start a rotation on any channel. @@ -4541,13 +4681,29 @@ int cmd_rotate_session(struct ltt_session *session, * session_list locks. */ if (!session->kernel_session && !ust_active) { + struct lttng_trace_archive_location *location; + + session->rotate_pending = false; + session->rotation_state = LTTNG_ROTATION_STATE_COMPLETED; ret = rename_complete_chunk(session, now); if (ret < 0) { ERR("Failed to rename completed rotation chunk"); goto end; } - session->rotate_pending = false; - session->rotation_status = LTTNG_ROTATION_STATUS_COMPLETED; + + /* Ownership of location is transferred. */ + location = session_get_trace_archive_location(session); + ret = notification_thread_command_session_rotation_completed( + notification_thread_handle, + session->name, + session->uid, + session->gid, + session->current_archive_id, + location); + if (ret != LTTNG_OK) { + ERR("Failed to notify notification thread that rotation is complete for session %s", + session->name); + } } } @@ -4556,80 +4712,249 @@ int cmd_rotate_session(struct ltt_session *session, } if (rotate_return) { - (*rotate_return)->rotate_id = session->rotate_count; - (*rotate_return)->status = LTTNG_ROTATION_STATUS_STARTED; + rotate_return->rotation_id = session->current_archive_id; } - - DBG("Cmd rotate session %s, rotate_id %" PRIu64 " completed", session->name, - session->rotate_count); + DBG("Cmd rotate session %s, current_archive_id %" PRIu64 " sent", + session->name, session->current_archive_id); ret = LTTNG_OK; - goto end; - -error: - if (rotate_return) { - (*rotate_return)->status = LTTNG_ROTATION_STATUS_ERROR; - } end: return ret; } /* - * Command LTTNG_ROTATE_PENDING from the lttng-ctl library. + * Command LTTNG_ROTATION_GET_INFO from the lttng-ctl library. * * Check if the session has finished its rotation. * * Return 0 on success or else a LTTNG_ERR code. */ -int cmd_rotate_pending(struct ltt_session *session, - struct lttng_rotate_pending_return **pending_return, - uint64_t rotate_id) +int cmd_rotate_get_info(struct ltt_session *session, + struct lttng_rotation_get_info_return *info_return, + uint64_t rotation_id) { int ret; assert(session); - DBG("Cmd rotate pending session %s, rotate_id %" PRIu64, session->name, - session->rotate_count); + DBG("Cmd rotate_get_info session %s, rotation id %" PRIu64, session->name, + session->current_archive_id); - *pending_return = zmalloc(sizeof(struct lttng_rotate_pending_return)); - if (!*pending_return) { - ret = -ENOMEM; - goto end; - } - - if (session->rotate_count != rotate_id) { - (*pending_return)->status = LTTNG_ROTATION_STATUS_EXPIRED; + if (session->current_archive_id != rotation_id) { + info_return->status = (int32_t) LTTNG_ROTATION_STATE_EXPIRED; ret = LTTNG_OK; goto end; } - if (session->rotation_status == LTTNG_ROTATION_STATUS_ERROR) { - DBG("An error occurred during rotation"); - (*pending_return)->status = LTTNG_ROTATION_STATUS_ERROR; - /* Rotate with a relay */ - } else if (session->rotate_pending_relay) { - DBG("Session %s, rotate_id %" PRIu64 " still pending", - session->name, session->rotate_count); - (*pending_return)->status = LTTNG_ROTATION_STATUS_STARTED; - } else if (session->rotate_pending) { - DBG("Session %s, rotate_id %" PRIu64 " still pending", - session->name, session->rotate_count); - (*pending_return)->status = LTTNG_ROTATION_STATUS_STARTED; - } else { - DBG("Session %s, rotate_id %" PRIu64 " finished", - session->name, session->rotate_count); - (*pending_return)->status = LTTNG_ROTATION_STATUS_COMPLETED; - ret = lttng_strncpy((*pending_return)->output_path, + switch (session->rotation_state) { + case LTTNG_ROTATION_STATE_ONGOING: + DBG("Reporting that rotation id %" PRIu64 " of session %s is still pending", + rotation_id, session->name); + break; + case LTTNG_ROTATION_STATE_COMPLETED: + { + char *current_tracing_path_reply; + size_t current_tracing_path_reply_len; + + switch (session_get_consumer_destination_type(session)) { + case CONSUMER_DST_LOCAL: + current_tracing_path_reply = + info_return->location.local.absolute_path; + current_tracing_path_reply_len = + sizeof(info_return->location.local.absolute_path); + info_return->location_type = + (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL; + break; + case CONSUMER_DST_NET: + current_tracing_path_reply = + info_return->location.relay.relative_path; + current_tracing_path_reply_len = + sizeof(info_return->location.relay.relative_path); + /* Currently the only supported relay protocol. */ + info_return->location.relay.protocol = + (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP; + + ret = lttng_strncpy(info_return->location.relay.host, + session_get_net_consumer_hostname(session), + sizeof(info_return->location.relay.host)); + if (ret) { + ERR("Failed to host name to rotate_get_info reply"); + info_return->status = LTTNG_ROTATION_STATUS_ERROR; + ret = -LTTNG_ERR_UNK; + goto end; + } + + session_get_net_consumer_ports(session, + &info_return->location.relay.ports.control, + &info_return->location.relay.ports.data); + info_return->location_type = + (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY; + break; + default: + abort(); + } + ret = lttng_strncpy(current_tracing_path_reply, session->rotation_chunk.current_rotate_path, - sizeof((*pending_return)->output_path)); + current_tracing_path_reply_len); if (ret) { - ERR("Failed to copy active tracing path to rotate pending command reply"); - (*pending_return)->status = LTTNG_ROTATION_STATUS_ERROR; - ret = -1; + ERR("Failed to copy current tracing path to rotate_get_info reply"); + info_return->status = LTTNG_ROTATION_STATUS_ERROR; + ret = -LTTNG_ERR_UNK; goto end; } + + break; + } + case LTTNG_ROTATION_STATE_ERROR: + DBG("Reporting that an error occurred during rotation %" PRIu64 " of session %s", + rotation_id, session->name); + break; + default: + abort(); + } + + info_return->status = (int32_t) session->rotation_state; + ret = LTTNG_OK; +end: + return ret; +} + +/* + * Command LTTNG_ROTATION_SET_SCHEDULE from the lttng-ctl library. + * + * Configure the automatic rotation parameters. + * 'activate' to true means activate the rotation schedule type with 'new_value'. + * 'activate' to false means deactivate the rotation schedule and validate that + * 'new_value' has the same value as the currently active value. + * + * Return 0 on success or else a positive LTTNG_ERR code. + */ +int cmd_rotation_set_schedule(struct ltt_session *session, + bool activate, enum lttng_rotation_schedule_type schedule_type, + uint64_t new_value, + struct notification_thread_handle *notification_thread_handle) +{ + int ret; + uint64_t *parameter_value; + + assert(session); + + DBG("Cmd rotate set schedule session %s", session->name); + + if (session->live_timer || session->snapshot_mode || + !session->output_traces) { + DBG("Failing ROTATION_SET_SCHEDULE command as the rotation feature is not available for this session"); + ret = LTTNG_ERR_ROTATION_NOT_AVAILABLE; + goto end; + } + + switch (schedule_type) { + case LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD: + parameter_value = &session->rotate_size; + break; + case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC: + parameter_value = &session->rotate_timer_period; + if (new_value >= UINT_MAX) { + DBG("Failing ROTATION_SET_SCHEDULE command as the value requested for a periodic rotation schedule is invalid: %" PRIu64 " > %u (UINT_MAX)", + new_value, UINT_MAX); + ret = LTTNG_ERR_INVALID; + goto end; + } + break; + default: + WARN("Failing ROTATION_SET_SCHEDULE command on unknown schedule type"); + ret = LTTNG_ERR_INVALID; + goto end; + } + + /* Improper use of the API. */ + if (new_value == -1ULL) { + WARN("Failing ROTATION_SET_SCHEDULE command as the value requested is -1"); + ret = LTTNG_ERR_INVALID; + goto end; + } + + /* + * As indicated in struct ltt_session's comments, a value of == 0 means + * this schedule rotation type is not in use. + * + * Reject the command if we were asked to activate a schedule that was + * already active. + */ + if (activate && *parameter_value != 0) { + DBG("Failing ROTATION_SET_SCHEDULE (activate) command as the schedule is already active"); + ret = LTTNG_ERR_ROTATION_SCHEDULE_SET; + goto end; + } + + /* + * Reject the command if we were asked to deactivate a schedule that was + * not active. + */ + if (!activate && *parameter_value == 0) { + DBG("Failing ROTATION_SET_SCHEDULE (deactivate) command as the schedule is already inactive"); + ret = LTTNG_ERR_ROTATION_SCHEDULE_NOT_SET; + goto end; + } + + /* + * Reject the command if we were asked to deactivate a schedule that + * doesn't exist. + */ + if (!activate && *parameter_value != new_value) { + DBG("Failing ROTATION_SET_SCHEDULE (deactivate) command as an inexistant schedule was provided"); + ret = LTTNG_ERR_ROTATION_SCHEDULE_NOT_SET; + goto end; + } + + *parameter_value = activate ? new_value : 0; + + switch (schedule_type) { + case LTTNG_ROTATION_SCHEDULE_TYPE_PERIODIC: + if (activate && session->active) { + /* + * Only start the timer if the session is active, + * otherwise it will be started when the session starts. + */ + ret = sessiond_rotate_timer_start(session, new_value); + if (ret) { + ERR("Failed to enable session rotation timer in ROTATION_SET_SCHEDULE command"); + ret = LTTNG_ERR_UNK; + goto end; + } + } else { + ret = sessiond_rotate_timer_stop(session); + if (ret) { + ERR("Failed to disable session rotation timer in ROTATION_SET_SCHEDULE command"); + ret = LTTNG_ERR_UNK; + goto end; + } + } + break; + case LTTNG_ROTATION_SCHEDULE_TYPE_SIZE_THRESHOLD: + if (activate) { + ret = subscribe_session_consumed_size_rotation(session, + new_value, notification_thread_handle); + if (ret) { + ERR("Failed to enable consumed-size notification in ROTATION_SET_SCHEDULE command"); + ret = LTTNG_ERR_UNK; + goto end; + } + } else { + ret = unsubscribe_session_consumed_size_rotation(session, + notification_thread_handle); + if (ret) { + ERR("Failed to disable consumed-size notification in ROTATION_SET_SCHEDULE command"); + ret = LTTNG_ERR_UNK; + goto end; + } + + } + break; + default: + /* Would have been caught before. */ + abort(); } ret = LTTNG_OK; @@ -4648,35 +4973,91 @@ end: * * Return LTTNG_OK on success or else a LTTNG_ERR code. */ -int cmd_rotate_get_current_path(struct ltt_session *session, - struct lttng_rotate_get_current_path **get_return) +int cmd_session_get_current_output(struct ltt_session *session, + struct lttng_session_get_current_output_return *output_return) { int ret; + const char *path; + + if (!session->snapshot_mode) { + if (session->current_archive_id == 0) { + if (session->kernel_session) { + path = session_get_base_path(session); + } else if (session->ust_session) { + path = session_get_base_path(session); + } else { + abort(); + } + assert(path); + } else { + path = session->rotation_chunk.active_tracing_path; + } + } else { + /* + * A snapshot session does not have a "current" trace archive + * location. + */ + path = ""; + } + + DBG("Cmd get current output for session %s, returning %s", + session->name, path); - *get_return = zmalloc(sizeof(struct lttng_rotate_get_current_path)); - if (!*get_return) { - ret = -ENOMEM; + ret = lttng_strncpy(output_return->path, + path, + sizeof(output_return->path)); + if (ret) { + ERR("Failed to copy trace output path to session get current output command reply"); + ret = -LTTNG_ERR_UNK; goto end; } - if (session->rotate_count == 0) { - (*get_return)->status = LTTNG_ROTATION_STATUS_NO_ROTATION; - } else { - (*get_return)->status = session->rotation_status; - ret = lttng_strncpy((*get_return)->output_path, - session->rotation_chunk.current_rotate_path, - sizeof((*get_return)->output_path)); + ret = LTTNG_OK; +end: + return ret; +} + +/* Wait for a given path to be removed before continuing. */ +static enum lttng_error_code wait_on_path(void *path_data) +{ + const char *shm_path = path_data; + + DBG("Waiting for the shm path at %s to be removed before completing session destruction", + shm_path); + while (true) { + int ret; + struct stat st; + + ret = stat(shm_path, &st); if (ret) { - ERR("Failed to copy trace output path to rotate get current path command reply"); - ret = -1; - goto end; + if (errno != ENOENT) { + PERROR("stat() returned an error while checking for the existence of the shm path"); + } else { + DBG("shm path no longer exists, completing the destruction of session"); + } + break; + } else { + if (!S_ISDIR(st.st_mode)) { + ERR("The type of shm path %s returned by stat() is not a directory; aborting the wait for shm path removal", + shm_path); + break; + } } + usleep(SESSION_DESTROY_SHM_PATH_CHECK_DELAY_US); } + return LTTNG_OK; +} - ret = LTTNG_OK; +/* + * Returns a pointer to a handler to run on completion of a command. + * Returns NULL if no handler has to be run for the last command executed. + */ +const struct cmd_completion_handler *cmd_pop_completion_handler(void) +{ + struct cmd_completion_handler *handler = current_completion_handler; -end: - return ret; + current_completion_handler = NULL; + return handler; } /*