#include <common/sessiond-comm/relayd.h>
#include <common/index/ctf-index.h>
#include <common/trace-chunk.h>
+#include <common/string-utils/format.h>
#include "relayd.h"
+static
+bool relayd_supports_chunks(const struct lttcomm_relayd_sock *sock)
+{
+ if (sock->major > 2) {
+ return true;
+ } else if (sock->major == 2 && sock->minor >= 11) {
+ return true;
+ }
+ return false;
+}
+
+static
+bool relayd_supports_get_configuration(const struct lttcomm_relayd_sock *sock)
+{
+ if (sock->major > 2) {
+ return true;
+ } else if (sock->major == 2 && sock->minor >= 12) {
+ return true;
+ }
+ return false;
+}
+
/*
* Send command. Fill up the header and append the data.
*/
}
/*
- * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name & hostname)
- * have no length restriction on the sender side.
+ * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name,
+ * hostname, and base_path) have no length restriction on the sender side.
* Length for both payloads is stored in the msg struct. A new dynamic size
* payload size is introduced.
*/
static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
const char *session_name, const char *hostname,
- int session_live_timer, unsigned int snapshot,
- uint64_t sessiond_session_id, const lttng_uuid sessiond_uuid)
+ const char *base_path, int session_live_timer,
+ unsigned int snapshot, uint64_t sessiond_session_id,
+ const lttng_uuid sessiond_uuid, const uint64_t *current_chunk_id,
+ time_t creation_time, bool session_name_contains_creation_time,
+ struct lttcomm_relayd_create_session_reply_2_11 *reply,
+ char *output_path)
{
int ret;
struct lttcomm_relayd_create_session_2_11 *msg = NULL;
size_t session_name_len;
size_t hostname_len;
+ size_t base_path_len;
size_t msg_length;
+ char *dst;
- /* The two names are sent with a '\0' delimiter between them. */
+ if (!base_path) {
+ base_path = "";
+ }
+ /* The three names are sent with a '\0' delimiter between them. */
session_name_len = strlen(session_name) + 1;
hostname_len = strlen(hostname) + 1;
+ base_path_len = strlen(base_path) + 1;
- msg_length = sizeof(*msg) + session_name_len + hostname_len;
+ msg_length = sizeof(*msg) + session_name_len + hostname_len + base_path_len;
msg = zmalloc(msg_length);
if (!msg) {
PERROR("zmalloc create_session_2_11 command message");
assert(hostname_len <= UINT32_MAX);
msg->hostname_len = htobe32(hostname_len);
- if (lttng_strncpy(msg->names, session_name, session_name_len)) {
+ assert(base_path_len <= UINT32_MAX);
+ msg->base_path_len = htobe32(base_path_len);
+
+ dst = msg->names;
+ if (lttng_strncpy(dst, session_name, session_name_len)) {
ret = -1;
goto error;
}
- if (lttng_strncpy(msg->names + session_name_len, hostname, hostname_len)) {
+ dst += session_name_len;
+ if (lttng_strncpy(dst, hostname, hostname_len)) {
+ ret = -1;
+ goto error;
+ }
+ dst += hostname_len;
+ if (lttng_strncpy(dst, base_path, base_path_len)) {
ret = -1;
goto error;
}
lttng_uuid_copy(msg->sessiond_uuid, sessiond_uuid);
msg->session_id = htobe64(sessiond_session_id);
+ msg->session_name_contains_creation_time = session_name_contains_creation_time;
+ if (current_chunk_id) {
+ LTTNG_OPTIONAL_SET(&msg->current_chunk_id,
+ htobe64(*current_chunk_id));
+ }
+
+ msg->creation_time = htobe64((uint64_t) creation_time);
/* Send command */
ret = send_command(rsock, RELAYD_CREATE_SESSION, msg, msg_length, 0);
if (ret < 0) {
goto error;
}
+ /* Receive response */
+ ret = recv_reply(rsock, reply, sizeof(*reply));
+ if (ret < 0) {
+ goto error;
+ }
+ reply->generic.session_id = be64toh(reply->generic.session_id);
+ reply->generic.ret_code = be32toh(reply->generic.ret_code);
+ reply->output_path_length = be32toh(reply->output_path_length);
+ if (reply->output_path_length >= LTTNG_PATH_MAX) {
+ ERR("Invalid session output path length in reply (%" PRIu32 " bytes) exceeds maximal allowed length (%d bytes)",
+ reply->output_path_length, LTTNG_PATH_MAX);
+ ret = -1;
+ goto error;
+ }
+ ret = recv_reply(rsock, output_path, reply->output_path_length);
+ if (ret < 0) {
+ goto error;
+ }
error:
free(msg);
return ret;
*/
static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock,
const char *session_name, const char *hostname,
- int session_live_timer, unsigned int snapshot)
+ int session_live_timer, unsigned int snapshot,
+ struct lttcomm_relayd_status_session *reply)
{
int ret;
struct lttcomm_relayd_create_session_2_4 msg;
goto error;
}
+ /* Receive response */
+ ret = recv_reply(rsock, reply, sizeof(*reply));
+ if (ret < 0) {
+ goto error;
+ }
+ reply->session_id = be64toh(reply->session_id);
+ reply->ret_code = be32toh(reply->ret_code);
error:
return ret;
}
/*
* RELAYD_CREATE_SESSION from 2.1 to 2.3.
*/
-static int relayd_create_session_2_1(struct lttcomm_relayd_sock *rsock)
+static int relayd_create_session_2_1(struct lttcomm_relayd_sock *rsock,
+ struct lttcomm_relayd_status_session *reply)
{
int ret;
goto error;
}
+ /* Receive response */
+ ret = recv_reply(rsock, reply, sizeof(*reply));
+ if (ret < 0) {
+ goto error;
+ }
+ reply->session_id = be64toh(reply->session_id);
+ reply->ret_code = be32toh(reply->ret_code);
error:
return ret;
}
int relayd_create_session(struct lttcomm_relayd_sock *rsock,
uint64_t *relayd_session_id,
const char *session_name, const char *hostname,
- int session_live_timer,
+ const char *base_path, int session_live_timer,
unsigned int snapshot, uint64_t sessiond_session_id,
- const lttng_uuid sessiond_uuid)
+ const lttng_uuid sessiond_uuid,
+ const uint64_t *current_chunk_id,
+ time_t creation_time, bool session_name_contains_creation_time,
+ char *output_path)
{
int ret;
- struct lttcomm_relayd_status_session reply;
+ struct lttcomm_relayd_create_session_reply_2_11 reply = {};
assert(rsock);
assert(relayd_session_id);
if (rsock->minor < 4) {
/* From 2.1 to 2.3 */
- ret = relayd_create_session_2_1(rsock);
+ ret = relayd_create_session_2_1(rsock, &reply.generic);
} else if (rsock->minor >= 4 && rsock->minor < 11) {
/* From 2.4 to 2.10 */
ret = relayd_create_session_2_4(rsock, session_name,
- hostname, session_live_timer, snapshot);
+ hostname, session_live_timer, snapshot,
+ &reply.generic);
} else {
/* From 2.11 to ... */
ret = relayd_create_session_2_11(rsock, session_name,
- hostname, session_live_timer, snapshot,
- sessiond_session_id, sessiond_uuid);
- }
-
- if (ret < 0) {
- goto error;
+ hostname, base_path, session_live_timer, snapshot,
+ sessiond_session_id, sessiond_uuid,
+ current_chunk_id, creation_time,
+ session_name_contains_creation_time,
+ &reply, output_path);
}
- /* Receive response */
- ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
if (ret < 0) {
goto error;
}
- reply.session_id = be64toh(reply.session_id);
- reply.ret_code = be32toh(reply.ret_code);
-
/* Return session id or negative ret code. */
- if (reply.ret_code != LTTNG_OK) {
+ if (reply.generic.ret_code != LTTNG_OK) {
ret = -1;
- ERR("Relayd create session replied error %d", reply.ret_code);
+ ERR("Relayd create session replied error %d",
+ reply.generic.ret_code);
goto error;
} else {
ret = 0;
- *relayd_session_id = reply.session_id;
+ *relayd_session_id = reply.generic.session_id;
}
- DBG("Relayd session created with id %" PRIu64, reply.session_id);
+ DBG("Relayd session created with id %" PRIu64, reply.generic.session_id);
error:
return ret;
msg->tracefile_size = htobe64(tracefile_size);
msg->tracefile_count = htobe64(tracefile_count);
- msg->trace_archive_id = htobe64(trace_archive_id);
+ msg->trace_chunk_id = htobe64(trace_archive_id);
/* Send command */
ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) msg, msg_length, 0);
/*
* Add stream on the relayd and assign stream handle to the stream_id argument.
*
+ * Chunks are not supported by relayd prior to 2.11, but are used to
+ * internally between session daemon and consumer daemon to keep track
+ * of the channel and stream output path.
+ *
* On success return 0 else return ret_code negative value.
*/
int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_name,
- const char *pathname, uint64_t *stream_id,
+ const char *domain_name, const char *_pathname, uint64_t *stream_id,
uint64_t tracefile_size, uint64_t tracefile_count,
struct lttng_trace_chunk *trace_chunk)
{
int ret;
struct lttcomm_relayd_status_stream reply;
+ char pathname[RELAYD_COMM_LTTNG_PATH_MAX];
+ char *separator;
/* Code flow error. Safety net. */
assert(rsock);
assert(channel_name);
- assert(pathname);
+ assert(domain_name);
+ assert(_pathname);
+ assert(trace_chunk);
DBG("Relayd adding stream for channel name %s", channel_name);
+ if (_pathname[0] == '\0') {
+ separator = "";
+ } else {
+ separator = "/";
+ }
+ ret = snprintf(pathname, RELAYD_COMM_LTTNG_PATH_MAX, "%s%s%s",
+ domain_name, separator, _pathname);
+ if (ret <= 0 || ret >= RELAYD_COMM_LTTNG_PATH_MAX) {
+ ERR("stream path too long.");
+ ret = -1;
+ goto error;
+ }
+
/* Compat with relayd 2.1 */
if (rsock->minor == 1) {
/* For 2.1 */
- assert(!trace_chunk);
ret = relayd_add_stream_2_1(rsock, channel_name, pathname);
} else if (rsock->minor > 1 && rsock->minor < 11) {
/* From 2.2 to 2.10 */
- assert(!trace_chunk);
ret = relayd_add_stream_2_2(rsock, channel_name, pathname,
tracefile_size, tracefile_count);
} else {
enum lttng_trace_chunk_status chunk_status;
uint64_t chunk_id;
- assert(trace_chunk);
chunk_status = lttng_trace_chunk_get_id(trace_chunk,
&chunk_id);
assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
return ret;
}
-int relayd_rotate_stream(struct lttcomm_relayd_sock *rsock, uint64_t stream_id,
- uint64_t new_chunk_id, uint64_t seq_num)
+int relayd_rotate_streams(struct lttcomm_relayd_sock *sock,
+ unsigned int stream_count, const uint64_t *new_chunk_id,
+ const struct relayd_stream_rotation_position *positions)
{
int ret;
- struct lttcomm_relayd_rotate_stream *msg = NULL;
- struct lttcomm_relayd_generic_reply reply;
- size_t len;
- int msg_len;
- /* FIXME */
- char *new_pathname = NULL;
+ unsigned int i;
+ struct lttng_dynamic_buffer payload;
+ struct lttcomm_relayd_generic_reply reply = {};
+ const struct lttcomm_relayd_rotate_streams msg = {
+ .stream_count = htobe32((uint32_t) stream_count),
+ .new_chunk_id = (typeof(msg.new_chunk_id)) {
+ .is_set = !!new_chunk_id,
+ .value = htobe64(new_chunk_id ? *new_chunk_id : 0),
+ },
+ };
+ char new_chunk_id_buf[MAX_INT_DEC_LEN(*new_chunk_id)] = {};
+ const char *new_chunk_id_str;
+
+ if (!relayd_supports_chunks(sock)) {
+ DBG("Refusing to rotate remote streams: relayd does not support chunks");
+ return 0;
+ }
+
+ lttng_dynamic_buffer_init(&payload);
/* Code flow error. Safety net. */
- assert(rsock);
-
- DBG("Sending rotate stream id %" PRIu64 " command to relayd", stream_id);
+ assert(sock);
- /* Account for the trailing NULL. */
- len = lttng_strnlen(new_pathname, LTTNG_PATH_MAX) + 1;
- if (len > LTTNG_PATH_MAX) {
- ERR("Path used in relayd rotate stream command exceeds the maximal allowed length");
- ret = -1;
- goto error;
+ if (new_chunk_id) {
+ ret = snprintf(new_chunk_id_buf, sizeof(new_chunk_id_buf),
+ "%" PRIu64, *new_chunk_id);
+ if (ret == -1 || ret >= sizeof(new_chunk_id_buf)) {
+ new_chunk_id_str = "formatting error";
+ } else {
+ new_chunk_id_str = new_chunk_id_buf;
+ }
+ } else {
+ new_chunk_id_str = "none";
}
- msg_len = offsetof(struct lttcomm_relayd_rotate_stream, new_pathname) + len;
- msg = zmalloc(msg_len);
- if (!msg) {
- PERROR("Failed to allocate relayd rotate stream command of %d bytes",
- msg_len);
- ret = -1;
- goto error;
- }
+ DBG("Preparing \"rotate streams\" command payload: new_chunk_id = %s, stream_count = %u",
+ new_chunk_id_str, stream_count);
- if (lttng_strncpy(msg->new_pathname, new_pathname, len)) {
- ret = -1;
- ERR("Failed to copy relayd rotate stream command's new path name");
- goto error;
+ ret = lttng_dynamic_buffer_append(&payload, &msg, sizeof(msg));
+ if (ret) {
+ ERR("Failed to allocate \"rotate streams\" command payload");
+ goto error;
+ }
+
+ for (i = 0; i < stream_count; i++) {
+ const struct relayd_stream_rotation_position *position =
+ &positions[i];
+ const struct lttcomm_relayd_stream_rotation_position comm_position = {
+ .stream_id = htobe64(position->stream_id),
+ .rotate_at_seq_num = htobe64(
+ position->rotate_at_seq_num),
+ };
+
+ DBG("Rotate stream %" PRIu64 "at sequence number %" PRIu64,
+ position->stream_id,
+ position->rotate_at_seq_num);
+ ret = lttng_dynamic_buffer_append(&payload, &comm_position,
+ sizeof(comm_position));
+ if (ret) {
+ ERR("Failed to allocate \"rotate streams\" command payload");
+ goto error;
+ }
}
- msg->pathname_length = htobe32(len);
- msg->stream_id = htobe64(stream_id);
- msg->new_chunk_id = htobe64(new_chunk_id);
- /*
- * The seq_num is invalid for metadata streams, but it is ignored on
- * the relay.
- */
- msg->rotate_at_seq_num = htobe64(seq_num);
-
/* Send command. */
- ret = send_command(rsock, RELAYD_ROTATE_STREAM, (void *) msg, msg_len, 0);
+ ret = send_command(sock, RELAYD_ROTATE_STREAMS, payload.data,
+ payload.size, 0);
if (ret < 0) {
- ERR("Send rotate command");
+ ERR("Failed to send \"rotate stream\" command");
goto error;
}
/* Receive response. */
- ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+ ret = recv_reply(sock, &reply, sizeof(reply));
if (ret < 0) {
- ERR("Receive rotate reply");
+ ERR("Failed to receive \"rotate streams\" command reply");
goto error;
}
reply.ret_code = be32toh(reply.ret_code);
-
- /* Return session id or negative ret code. */
if (reply.ret_code != LTTNG_OK) {
ret = -1;
- ERR("Relayd rotate stream replied error %d", reply.ret_code);
+ ERR("Relayd rotate streams replied error %d", reply.ret_code);
} else {
/* Success. */
ret = 0;
- DBG("Relayd rotated stream id %" PRIu64 " successfully", stream_id);
+ DBG("Relayd rotated streams successfully");
}
error:
- free(msg);
+ lttng_dynamic_buffer_reset(&payload);
return ret;
}
-int relayd_rotate_rename(struct lttcomm_relayd_sock *rsock,
- const char *old_path, const char *new_path)
+int relayd_create_trace_chunk(struct lttcomm_relayd_sock *sock,
+ struct lttng_trace_chunk *chunk)
{
- int ret;
- struct lttcomm_relayd_rotate_rename *msg = NULL;
- struct lttcomm_relayd_generic_reply reply;
- size_t old_path_length, new_path_length;
- size_t msg_length;
-
- /* Code flow error. Safety net. */
- assert(rsock);
-
- DBG("Relayd rename chunk %s to %s", old_path, new_path);
+ int ret = 0;
+ enum lttng_trace_chunk_status status;
+ struct lttcomm_relayd_create_trace_chunk msg = {};
+ struct lttcomm_relayd_generic_reply reply = {};
+ struct lttng_dynamic_buffer payload;
+ uint64_t chunk_id;
+ time_t creation_timestamp;
+ const char *chunk_name;
+ size_t chunk_name_length;
+ bool overridden_name;
+
+ lttng_dynamic_buffer_init(&payload);
+
+ if (!relayd_supports_chunks(sock)) {
+ DBG("Refusing to create remote trace chunk: relayd does not support chunks");
+ goto end;
+ }
- /* The two paths are sent with a '\0' delimiter between them. */
- old_path_length = strlen(old_path) + 1;
- new_path_length = strlen(new_path) + 1;
+ status = lttng_trace_chunk_get_id(chunk, &chunk_id);
+ if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ ret = -1;
+ goto end;
+ }
- msg_length = sizeof(*msg) + old_path_length + new_path_length;
- msg = zmalloc(msg_length);
- if (!msg) {
- PERROR("zmalloc rotate-rename command message");
+ status = lttng_trace_chunk_get_creation_timestamp(
+ chunk, &creation_timestamp);
+ if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
ret = -1;
- goto error;
+ goto end;
}
- assert(old_path_length <= UINT32_MAX);
- msg->old_path_length = htobe32(old_path_length);
+ status = lttng_trace_chunk_get_name(
+ chunk, &chunk_name, &overridden_name);
+ if (status != LTTNG_TRACE_CHUNK_STATUS_OK &&
+ status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
+ ret = -1;
+ goto end;
+ }
- assert(new_path_length <= UINT32_MAX);
- msg->new_path_length = htobe32(new_path_length);
+ chunk_name_length = overridden_name ? (strlen(chunk_name) + 1) : 0;
+ msg = (typeof(msg)){
+ .chunk_id = htobe64(chunk_id),
+ .creation_timestamp = htobe64((uint64_t) creation_timestamp),
+ .override_name_length = htobe32((uint32_t) chunk_name_length),
+ };
- strcpy(msg->paths, old_path);
- strcpy(msg->paths + old_path_length, new_path);
+ ret = lttng_dynamic_buffer_append(&payload, &msg, sizeof(msg));
+ if (ret) {
+ goto end;
+ }
+ if (chunk_name_length) {
+ ret = lttng_dynamic_buffer_append(
+ &payload, chunk_name, chunk_name_length);
+ if (ret) {
+ goto end;
+ }
+ }
- /* Send command */
- ret = send_command(rsock, RELAYD_ROTATE_RENAME, (const void *) msg,
- msg_length, 0);
+ ret = send_command(sock, RELAYD_CREATE_TRACE_CHUNK, payload.data,
+ payload.size, 0);
if (ret < 0) {
- goto error;
+ ERR("Failed to send trace chunk creation command to relay daemon");
+ goto end;
}
- /* Receive response */
- ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+ ret = recv_reply(sock, &reply, sizeof(reply));
if (ret < 0) {
- goto error;
+ ERR("Failed to receive relay daemon trace chunk creation command reply");
+ goto end;
}
reply.ret_code = be32toh(reply.ret_code);
-
- /* Return session id or negative ret code. */
if (reply.ret_code != LTTNG_OK) {
ret = -1;
- ERR("Relayd rotate rename replied error %d", reply.ret_code);
+ ERR("Relayd trace chunk create replied error %d",
+ reply.ret_code);
} else {
- /* Success */
ret = 0;
+ DBG("Relayd successfully created trace chunk: chunk_id = %" PRIu64,
+ chunk_id);
}
- DBG("Relayd rotate rename completed successfully");
-
-error:
- free(msg);
+end:
+ lttng_dynamic_buffer_reset(&payload);
return ret;
}
-int relayd_rotate_pending(struct lttcomm_relayd_sock *rsock, uint64_t chunk_id)
+int relayd_close_trace_chunk(struct lttcomm_relayd_sock *sock,
+ struct lttng_trace_chunk *chunk,
+ char *path)
{
- int ret;
- struct lttcomm_relayd_rotate_pending msg;
- struct lttcomm_relayd_rotate_pending_reply reply;
+ int ret = 0;
+ enum lttng_trace_chunk_status status;
+ struct lttcomm_relayd_close_trace_chunk msg = {};
+ struct lttcomm_relayd_close_trace_chunk_reply reply = {};
+ uint64_t chunk_id;
+ time_t close_timestamp;
+ LTTNG_OPTIONAL(enum lttng_trace_chunk_command_type) close_command = {};
+
+ if (!relayd_supports_chunks(sock)) {
+ DBG("Refusing to close remote trace chunk: relayd does not support chunks");
+ goto end;
+ }
- /* Code flow error. Safety net. */
- assert(rsock);
+ status = lttng_trace_chunk_get_id(chunk, &chunk_id);
+ if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ ERR("Failed to get trace chunk id");
+ ret = -1;
+ goto end;
+ }
- DBG("Querying relayd for rotate pending with chunk_id %" PRIu64,
- chunk_id);
+ status = lttng_trace_chunk_get_close_timestamp(chunk, &close_timestamp);
+ if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+ ERR("Failed to get trace chunk close timestamp");
+ ret = -1;
+ goto end;
+ }
- memset(&msg, 0, sizeof(msg));
- msg.chunk_id = htobe64(chunk_id);
+ status = lttng_trace_chunk_get_close_command(chunk,
+ &close_command.value);
+ switch (status) {
+ case LTTNG_TRACE_CHUNK_STATUS_OK:
+ close_command.is_set = 1;
+ break;
+ case LTTNG_TRACE_CHUNK_STATUS_NONE:
+ break;
+ default:
+ ERR("Failed to get trace chunk close command");
+ ret = -1;
+ goto end;
+ }
- /* Send command */
- ret = send_command(rsock, RELAYD_ROTATE_PENDING, (void *) &msg,
- sizeof(msg), 0);
+ msg = (typeof(msg)){
+ .chunk_id = htobe64(chunk_id),
+ .close_timestamp = htobe64((uint64_t) close_timestamp),
+ .close_command = {
+ .value = htobe32((uint32_t) close_command.value),
+ .is_set = close_command.is_set,
+ },
+ };
+
+ ret = send_command(sock, RELAYD_CLOSE_TRACE_CHUNK, &msg, sizeof(msg),
+ 0);
if (ret < 0) {
- goto error;
+ ERR("Failed to send trace chunk close command to relay daemon");
+ goto end;
}
- /* Receive response */
- ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+ ret = recv_reply(sock, &reply, sizeof(reply));
if (ret < 0) {
- goto error;
+ ERR("Failed to receive relay daemon trace chunk close command reply");
+ goto end;
}
- reply.generic.ret_code = be32toh(reply.generic.ret_code);
+ reply.path_length = be32toh(reply.path_length);
+ if (reply.path_length >= LTTNG_PATH_MAX) {
+ ERR("Chunk path too long");
+ ret = -1;
+ goto end;
+ }
- /* Return session id or negative ret code. */
+ ret = recv_reply(sock, path, reply.path_length);
+ if (ret < 0) {
+ ERR("Failed to receive relay daemon trace chunk close command reply");
+ goto end;
+ }
+ if (path[reply.path_length - 1] != '\0') {
+ ERR("Invalid trace chunk path returned by relay daemon (not null-terminated)");
+ ret = -1;
+ goto end;
+ }
+
+ reply.generic.ret_code = be32toh(reply.generic.ret_code);
if (reply.generic.ret_code != LTTNG_OK) {
- ret = -reply.generic.ret_code;
- ERR("Relayd rotate pending replied with error %d", ret);
- goto error;
+ ret = -1;
+ ERR("Relayd trace chunk close replied error %d",
+ reply.generic.ret_code);
} else {
- /* No error, just rotate pending state */
- if (reply.is_pending == 0 || reply.is_pending == 1) {
- ret = reply.is_pending;
- DBG("Relayd rotate pending command completed successfully with result \"%s\"",
- ret ? "rotation pending" : "rotation NOT pending");
- } else {
- ret = -LTTNG_ERR_UNK;
- }
+ ret = 0;
+ DBG("Relayd successfully closed trace chunk: chunk_id = %" PRIu64,
+ chunk_id);
}
-
-error:
+end:
return ret;
}
-int relayd_mkdir(struct lttcomm_relayd_sock *rsock, const char *path)
+int relayd_trace_chunk_exists(struct lttcomm_relayd_sock *sock,
+ uint64_t chunk_id, bool *chunk_exists)
{
- int ret;
- struct lttcomm_relayd_mkdir *msg;
- struct lttcomm_relayd_generic_reply reply;
- size_t len;
+ int ret = 0;
+ struct lttcomm_relayd_trace_chunk_exists msg = {};
+ struct lttcomm_relayd_trace_chunk_exists_reply reply = {};
+
+ if (!relayd_supports_chunks(sock)) {
+ DBG("Refusing to check for trace chunk existence: relayd does not support chunks");
+ /* The chunk will never exist */
+ *chunk_exists = false;
+ goto end;
+ }
- /* Code flow error. Safety net. */
- assert(rsock);
+ msg = (typeof(msg)){
+ .chunk_id = htobe64(chunk_id),
+ };
- DBG("Relayd mkdir path %s", path);
+ ret = send_command(sock, RELAYD_TRACE_CHUNK_EXISTS, &msg, sizeof(msg),
+ 0);
+ if (ret < 0) {
+ ERR("Failed to send trace chunk exists command to relay daemon");
+ goto end;
+ }
- len = strlen(path) + 1;
- msg = zmalloc(sizeof(msg->length) + len);
- if (!msg) {
- PERROR("Alloc mkdir msg");
- ret = -1;
- goto error;
+ ret = recv_reply(sock, &reply, sizeof(reply));
+ if (ret < 0) {
+ ERR("Failed to receive relay daemon trace chunk close command reply");
+ goto end;
}
- msg->length = htobe32((uint32_t) len);
- if (lttng_strncpy(msg->path, path, len)) {
+ reply.generic.ret_code = be32toh(reply.generic.ret_code);
+ if (reply.generic.ret_code != LTTNG_OK) {
ret = -1;
- goto error;
+ ERR("Relayd trace chunk close replied error %d",
+ reply.generic.ret_code);
+ } else {
+ ret = 0;
+ DBG("Relayd successfully checked trace chunk existence: chunk_id = %" PRIu64
+ ", exists = %s", chunk_id,
+ reply.trace_chunk_exists ? "true" : "false");
+ *chunk_exists = !!reply.trace_chunk_exists;
+ }
+end:
+ return ret;
+}
+
+int relayd_get_configuration(struct lttcomm_relayd_sock *sock,
+ uint64_t query_flags,
+ uint64_t *result_flags)
+{
+ int ret = 0;
+ struct lttcomm_relayd_get_configuration msg = (typeof(msg)) {
+ .query_flags = htobe64(query_flags),
+ };
+ struct lttcomm_relayd_get_configuration_reply reply = {};
+
+ if (!relayd_supports_get_configuration(sock)) {
+ DBG("Refusing to get relayd configuration (unsupported by relayd)");
+ if (query_flags) {
+ ret = -1;
+ goto end;
+ }
+ *result_flags = 0;
+ goto end;
}
- /* Send command */
- ret = send_command(rsock, RELAYD_MKDIR, (void *) msg,
- sizeof(msg->length) + len, 0);
+ ret = send_command(sock, RELAYD_GET_CONFIGURATION, &msg, sizeof(msg),
+ 0);
if (ret < 0) {
- goto error;
+ ERR("Failed to send get configuration command to relay daemon");
+ goto end;
}
- /* Receive response */
- ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+ ret = recv_reply(sock, &reply, sizeof(reply));
if (ret < 0) {
- goto error;
+ ERR("Failed to receive relay daemon get configuration command reply");
+ goto end;
}
- reply.ret_code = be32toh(reply.ret_code);
-
- /* Return session id or negative ret code. */
- if (reply.ret_code != LTTNG_OK) {
+ reply.generic.ret_code = be32toh(reply.generic.ret_code);
+ if (reply.generic.ret_code != LTTNG_OK) {
ret = -1;
- ERR("Relayd mkdir replied error %d", reply.ret_code);
+ ERR("Relayd get configuration replied error %d",
+ reply.generic.ret_code);
} else {
- /* Success */
+ reply.relayd_configuration_flags =
+ be64toh(reply.relayd_configuration_flags);
ret = 0;
+ DBG("Relayd successfully got configuration: query_flags = %" PRIu64
+ ", results_flags = %" PRIu64, query_flags,
+ reply.relayd_configuration_flags);
+ *result_flags = reply.relayd_configuration_flags;
}
-
- DBG("Relayd mkdir completed successfully");
-
-error:
- free(msg);
+end:
return ret;
}
projects / lttng-tools.git / blobdiff