X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=6722341bb4b1be79f11a88b96c8989a3cf15e734;hp=e0a8db9b2cc13a2b5c77407e0b14938fa565a587;hb=462ae7ae036d5f0b4be820345f324e77f5b607c1;hpb=504521ea8462dbd9c188a59c4d04a1f5a0c4c537 diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index e0a8db9b2..6722341bb 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -47,7 +47,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,6 +55,7 @@ #include "rotate.h" #include "rotation-thread.h" #include "sessiond-timer.h" +#include "agent-thread.h" #include "cmd.h" @@ -917,8 +918,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 +1004,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 +1014,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 +1153,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 +1385,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 +2101,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); @@ -2600,7 +2613,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 @@ -2633,7 +2646,7 @@ int rename_active_chunk(struct ltt_session *session) goto end; } end: - session->rotate_count--; + session->current_archive_id--; return ret; } @@ -2669,7 +2682,7 @@ int cmd_stop_trace(struct ltt_session *session) sessiond_rotate_timer_stop(session); } - if (session->rotate_count > 0 && !session->rotate_pending) { + if (session->current_archive_id > 0 && !session->rotate_pending) { ret = rename_active_chunk(session); if (ret) { /* @@ -3671,10 +3684,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; } @@ -4428,7 +4443,7 @@ int cmd_rotate_session(struct ltt_session *session, } /* 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. */ @@ -4464,7 +4479,7 @@ int cmd_rotate_session(struct ltt_session *session, } DBG("Current rotate path %s", session->rotation_chunk.current_rotate_path); - session->rotate_count++; + session->current_archive_id++; session->rotate_pending = true; session->rotation_state = LTTNG_ROTATION_STATE_ONGOING; @@ -4501,7 +4516,7 @@ 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; @@ -4514,7 +4529,7 @@ 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; @@ -4543,7 +4558,7 @@ int cmd_rotate_session(struct ltt_session *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; @@ -4551,7 +4566,7 @@ int cmd_rotate_session(struct ltt_session *session, } 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; @@ -4594,11 +4609,11 @@ int cmd_rotate_session(struct ltt_session *session, } if (rotate_return) { - rotate_return->rotation_id = session->rotate_count; + rotate_return->rotation_id = session->current_archive_id; } - DBG("Cmd rotate session %s, rotate_id %" PRIu64 " sent", session->name, - session->rotate_count); + DBG("Cmd rotate session %s, current_archive_id %" PRIu64 " sent", + session->name, session->current_archive_id); ret = LTTNG_OK; end: @@ -4621,9 +4636,9 @@ int cmd_rotate_get_info(struct ltt_session *session, assert(session); DBG("Cmd rotate_get_info session %s, rotation id %" PRIu64, session->name, - session->rotate_count); + session->current_archive_id); - if (session->rotate_count != rotation_id) { + if (session->current_archive_id != rotation_id) { info_return->status = (int32_t) LTTNG_ROTATION_STATE_EXPIRED; ret = LTTNG_OK; goto end; @@ -4635,16 +4650,59 @@ int cmd_rotate_get_info(struct ltt_session *session, rotation_id, session->name); break; case LTTNG_ROTATION_STATE_COMPLETED: - ret = lttng_strncpy(info_return->path, + { + 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(info_return->path)); + current_tracing_path_reply_len); if (ret) { - ERR("Failed to copy active tracing path to rotate_get_info reply"); + 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); @@ -4769,7 +4827,7 @@ int cmd_session_get_current_output(struct ltt_session *session, const char *path; if (!session->snapshot_mode) { - if (session->rotate_count == 0) { + if (session->current_archive_id == 0) { if (session->kernel_session) { path = session_get_base_path(session); } else if (session->ust_session) {