X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=830c7c263f89935f0ecf00cc91ca5d17cc9fa320;hp=4cb1c1fd339d248d028901ad4c390faa8b1f654e;hb=bbc4768c20f1c552222e1746f9475d145d7bf04e;hpb=67d5aa2855e526af41a75754f99a70c281936636

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 4cb1c1fd3..830c7c263 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -26,8 +26,10 @@
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/compat/endian.h>
+#include <common/compat/string.h>
 #include <common/sessiond-comm/relayd.h>
 #include <common/index/ctf-index.h>
+#include <common/trace-chunk.h>
 
 #include "relayd.h"
 
@@ -35,7 +37,7 @@
  * Send command. Fill up the header and append the data.
  */
 static int send_command(struct lttcomm_relayd_sock *rsock,
-		enum lttcomm_relayd_command cmd, void *data, size_t size,
+		enum lttcomm_relayd_command cmd, const void *data, size_t size,
 		int flags)
 {
 	int ret;
@@ -72,14 +74,14 @@ static int send_command(struct lttcomm_relayd_sock *rsock,
 		memcpy(buf + sizeof(header), data, size);
 	}
 
+	DBG3("Relayd sending command %d of size %" PRIu64, (int) cmd, buf_size);
 	ret = rsock->sock.ops->sendmsg(&rsock->sock, buf, buf_size, flags);
 	if (ret < 0) {
+		PERROR("Failed to send command %d of size %" PRIu64,
+				(int) cmd, buf_size);
 		ret = -errno;
 		goto error;
 	}
-
-	DBG3("Relayd sending command %d of size %" PRIu64, cmd, buf_size);
-
 error:
 	free(buf);
 alloc_error:
@@ -119,11 +121,76 @@ error:
 }
 
 /*
- * Starting at 2.4, RELAYD_CREATE_SESSION takes additional parameters to
+ * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name & hostname)
+ * 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 uint64_t *current_chunk_id)
+{
+	int ret;
+	struct lttcomm_relayd_create_session_2_11 *msg = NULL;
+	size_t session_name_len;
+	size_t hostname_len;
+	size_t msg_length;
+
+	/* The two names are sent with a '\0' delimiter between them. */
+	session_name_len = strlen(session_name) + 1;
+	hostname_len = strlen(hostname) + 1;
+
+	msg_length = sizeof(*msg) + session_name_len + hostname_len;
+	msg = zmalloc(msg_length);
+	if (!msg) {
+		PERROR("zmalloc create_session_2_11 command message");
+		ret = -1;
+		goto error;
+	}
+
+	assert(session_name_len <= UINT32_MAX);
+	msg->session_name_len = htobe32(session_name_len);
+
+	assert(hostname_len <= UINT32_MAX);
+	msg->hostname_len = htobe32(hostname_len);
+
+	if (lttng_strncpy(msg->names, session_name, session_name_len)) {
+		ret = -1;
+		goto error;
+	}
+	if (lttng_strncpy(msg->names + session_name_len, hostname, hostname_len)) {
+		ret = -1;
+		goto error;
+	}
+
+	msg->live_timer = htobe32(session_live_timer);
+	msg->snapshot = !!snapshot;
+
+	lttng_uuid_copy(msg->sessiond_uuid, sessiond_uuid);
+	msg->session_id = htobe64(sessiond_session_id);
+
+	if (current_chunk_id) {
+		LTTNG_OPTIONAL_SET(&msg->current_chunk_id,
+				htobe64(*current_chunk_id));
+	}
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_CREATE_SESSION, msg, msg_length, 0);
+	if (ret < 0) {
+		goto error;
+	}
+error:
+	free(msg);
+	return ret;
+}
+/*
+ * From 2.4 to 2.10, RELAYD_CREATE_SESSION takes additional parameters to
  * support the live reading capability.
  */
 static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock,
-		uint64_t *session_id, char *session_name, char *hostname,
+		const char *session_name, const char *hostname,
 		int session_live_timer, unsigned int snapshot)
 {
 	int ret;
@@ -154,8 +221,7 @@ error:
 /*
  * RELAYD_CREATE_SESSION from 2.1 to 2.3.
  */
-static int relayd_create_session_2_1(struct lttcomm_relayd_sock *rsock,
-		uint64_t *session_id)
+static int relayd_create_session_2_1(struct lttcomm_relayd_sock *rsock)
 {
 	int ret;
 
@@ -176,29 +242,35 @@ error:
  * On success, return 0 else a negative value which is either an errno error or
  * a lttng error code from the relayd.
  */
-int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_id,
-		char *session_name, char *hostname, int session_live_timer,
-		unsigned int snapshot)
+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,
+		unsigned int snapshot, uint64_t sessiond_session_id,
+		const lttng_uuid sessiond_uuid,
+		const uint64_t *current_chunk_id)
 {
 	int ret;
 	struct lttcomm_relayd_status_session reply;
 
 	assert(rsock);
-	assert(session_id);
+	assert(relayd_session_id);
 
 	DBG("Relayd create session");
 
-	switch(rsock->minor) {
-		case 1:
-		case 2:
-		case 3:
-			ret = relayd_create_session_2_1(rsock, session_id);
-			break;
-		case 4:
-		default:
-			ret = relayd_create_session_2_4(rsock, session_id, session_name,
-					hostname, session_live_timer, snapshot);
-			break;
+	if (rsock->minor < 4) {
+		/* From 2.1 to 2.3 */
+		ret = relayd_create_session_2_1(rsock);
+	} 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);
+	} else {
+		/* From 2.11 to ... */
+		ret = relayd_create_session_2_11(rsock, session_name,
+				hostname, session_live_timer, snapshot,
+				sessiond_session_id, sessiond_uuid,
+				current_chunk_id);
 	}
 
 	if (ret < 0) {
@@ -221,7 +293,7 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
 		goto error;
 	} else {
 		ret = 0;
-		*session_id = reply.session_id;
+		*relayd_session_id = reply.session_id;
 	}
 
 	DBG("Relayd session created with id %" PRIu64, reply.session_id);
@@ -230,6 +302,121 @@ error:
 	return ret;
 }
 
+static int relayd_add_stream_2_1(struct lttcomm_relayd_sock *rsock,
+		const char *channel_name, const char *pathname)
+{
+	int ret;
+	struct lttcomm_relayd_add_stream msg;
+
+	memset(&msg, 0, sizeof(msg));
+	if (lttng_strncpy(msg.channel_name, channel_name,
+				sizeof(msg.channel_name))) {
+		ret = -1;
+		goto error;
+	}
+
+	if (lttng_strncpy(msg.pathname, pathname,
+				sizeof(msg.pathname))) {
+		ret = -1;
+		goto error;
+	}
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
+	if (ret < 0) {
+		ret = -1;
+		goto error;
+	}
+	ret = 0;
+error:
+	return ret;
+}
+
+static int relayd_add_stream_2_2(struct lttcomm_relayd_sock *rsock,
+		const char *channel_name, const char *pathname,
+		uint64_t tracefile_size, uint64_t tracefile_count)
+{
+	int ret;
+	struct lttcomm_relayd_add_stream_2_2 msg;
+
+	memset(&msg, 0, sizeof(msg));
+	/* Compat with relayd 2.2 to 2.10 */
+	if (lttng_strncpy(msg.channel_name, channel_name,
+				sizeof(msg.channel_name))) {
+		ret = -1;
+		goto error;
+	}
+	if (lttng_strncpy(msg.pathname, pathname,
+				sizeof(msg.pathname))) {
+		ret = -1;
+		goto error;
+	}
+	msg.tracefile_size = htobe64(tracefile_size);
+	msg.tracefile_count = htobe64(tracefile_count);
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
+	if (ret < 0) {
+		goto error;
+	}
+	ret = 0;
+error:
+	return ret;
+}
+
+static int relayd_add_stream_2_11(struct lttcomm_relayd_sock *rsock,
+		const char *channel_name, const char *pathname,
+		uint64_t tracefile_size, uint64_t tracefile_count,
+		uint64_t trace_archive_id)
+{
+	int ret;
+	struct lttcomm_relayd_add_stream_2_11 *msg = NULL;
+	size_t channel_name_len;
+	size_t pathname_len;
+	size_t msg_length;
+
+	/* The two names are sent with a '\0' delimiter between them. */
+	channel_name_len = strlen(channel_name) + 1;
+	pathname_len = strlen(pathname) + 1;
+
+	msg_length = sizeof(*msg) + channel_name_len + pathname_len;
+	msg = zmalloc(msg_length);
+	if (!msg) {
+		PERROR("zmalloc add_stream_2_11 command message");
+		ret = -1;
+		goto error;
+	}
+
+	assert(channel_name_len <= UINT32_MAX);
+	msg->channel_name_len = htobe32(channel_name_len);
+
+	assert(pathname_len <= UINT32_MAX);
+	msg->pathname_len = htobe32(pathname_len);
+
+	if (lttng_strncpy(msg->names, channel_name, channel_name_len)) {
+		ret = -1;
+		goto error;
+	}
+	if (lttng_strncpy(msg->names + channel_name_len, pathname, pathname_len)) {
+		ret = -1;
+		goto error;
+	}
+
+	msg->tracefile_size = htobe64(tracefile_size);
+	msg->tracefile_count = htobe64(tracefile_count);
+	msg->trace_archive_id = htobe64(trace_archive_id);
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) msg, msg_length, 0);
+	if (ret < 0) {
+		goto error;
+	}
+	ret = 0;
+error:
+	free(msg);
+	return ret;
+}
+
 /*
  * Add stream on the relayd and assign stream handle to the stream_id argument.
  *
@@ -237,11 +424,10 @@ error:
  */
 int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_name,
 		const char *pathname, uint64_t *stream_id,
-		uint64_t tracefile_size, uint64_t tracefile_count)
+		uint64_t tracefile_size, uint64_t tracefile_count,
+		struct lttng_trace_chunk *trace_chunk)
 {
 	int ret;
-	struct lttcomm_relayd_add_stream msg;
-	struct lttcomm_relayd_add_stream_2_2 msg_2_2;
 	struct lttcomm_relayd_status_stream reply;
 
 	/* Code flow error. Safety net. */
@@ -253,44 +439,33 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 
 	/* Compat with relayd 2.1 */
 	if (rsock->minor == 1) {
-		memset(&msg, 0, sizeof(msg));
-		if (lttng_strncpy(msg.channel_name, channel_name,
-				sizeof(msg.channel_name))) {
-			ret = -1;
-			goto error;
-		}
-		if (lttng_strncpy(msg.pathname, pathname,
-				sizeof(msg.pathname))) {
-			ret = -1;
-			goto error;
-		}
-
-		/* Send command */
-		ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
-		if (ret < 0) {
-			goto error;
-		}
+		/* 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 {
-		memset(&msg_2_2, 0, sizeof(msg_2_2));
-		/* Compat with relayd 2.2+ */
-		if (lttng_strncpy(msg_2_2.channel_name, channel_name,
-				sizeof(msg_2_2.channel_name))) {
-			ret = -1;
-			goto error;
-		}
-		if (lttng_strncpy(msg_2_2.pathname, pathname,
-				sizeof(msg_2_2.pathname))) {
-			ret = -1;
-			goto error;
-		}
-		msg_2_2.tracefile_size = htobe64(tracefile_size);
-		msg_2_2.tracefile_count = htobe64(tracefile_count);
+		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);
+
+		/* From 2.11 to ...*/
+		ret = relayd_add_stream_2_11(rsock, channel_name, pathname,
+				tracefile_size, tracefile_count,
+				chunk_id);
+	}
 
-		/* Send command */
-		ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg_2_2, sizeof(msg_2_2), 0);
-		if (ret < 0) {
-			goto error;
-		}
+	if (ret) {
+		ret = -1;
+		goto error;
 	}
 
 	/* Waiting for reply */
@@ -314,7 +489,7 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 	}
 
 	DBG("Relayd stream added successfully with handle %" PRIu64,
-		reply.handle);
+			reply.handle);
 
 error:
 	return ret;
@@ -941,3 +1116,242 @@ int relayd_reset_metadata(struct lttcomm_relayd_sock *rsock,
 error:
 	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 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;
+
+	/* Code flow error. Safety net. */
+	assert(rsock);
+
+	DBG("Sending rotate stream id %" PRIu64 " command to relayd", stream_id);
+
+	/* 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;
+	}
+
+	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;
+	}
+
+	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;
+	}
+
+	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);
+	if (ret < 0) {
+		ERR("Send rotate command");
+		goto error;
+	}
+
+	/* Receive response. */
+	ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+	if (ret < 0) {
+		ERR("Receive rotate 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);
+	} else {
+		/* Success. */
+		ret = 0;
+		DBG("Relayd rotated stream id %" PRIu64 " successfully", stream_id);
+	}
+
+error:
+	free(msg);
+	return ret;
+}
+
+int relayd_create_trace_chunk(struct lttcomm_relayd_sock *sock,
+		struct lttng_trace_chunk *chunk)
+{
+	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 overriden_name;
+
+	lttng_dynamic_buffer_init(&payload);
+
+	status = lttng_trace_chunk_get_id(chunk, &chunk_id);
+	if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+		ret = -1;
+		goto end;
+	}
+
+	status = lttng_trace_chunk_get_creation_timestamp(
+			chunk, &creation_timestamp);
+	if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+		ret = -1;
+		goto end;
+	}
+
+	status = lttng_trace_chunk_get_name(
+			chunk, &chunk_name, &overriden_name);
+	if (status != LTTNG_TRACE_CHUNK_STATUS_OK &&
+			status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
+		ret = -1;
+		goto end;
+	}
+
+	chunk_name_length = overriden_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),
+	};
+
+	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;
+		}
+	}
+
+	ret = send_command(sock, RELAYD_CREATE_TRACE_CHUNK, payload.data,
+			payload.size, 0);
+	if (ret < 0) {
+		ERR("Failed to send trace chunk creation command to relay daemon");
+		goto end;
+	}
+
+	ret = recv_reply(sock, &reply, sizeof(reply));
+	if (ret < 0) {
+		ERR("Failed to receive relay daemon trace chunk creation command reply");
+		goto end;
+	}
+
+	reply.ret_code = be32toh(reply.ret_code);
+	if (reply.ret_code != LTTNG_OK) {
+		ret = -1;
+		ERR("Relayd trace chunk create replied error %d",
+				reply.ret_code);
+	} else {
+		ret = 0;
+		DBG("Relayd successfully created trace chunk: chunk_id = %" PRIu64,
+				chunk_id);
+	}
+
+end:
+	lttng_dynamic_buffer_reset(&payload);
+	return ret;
+}
+
+int relayd_close_trace_chunk(struct lttcomm_relayd_sock *sock,
+		struct lttng_trace_chunk *chunk)
+{
+	int ret = 0;
+	enum lttng_trace_chunk_status status;
+	struct lttcomm_relayd_close_trace_chunk msg = {};
+	struct lttcomm_relayd_generic_reply reply = {};
+	uint64_t chunk_id;
+	time_t close_timestamp;
+	LTTNG_OPTIONAL(enum lttng_trace_chunk_command_type) close_command = {};
+
+	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;
+	}
+
+	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;
+	}
+
+	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;
+	}
+
+	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) {
+		ERR("Failed to send trace chunk close command to relay daemon");
+		goto end;
+	}
+
+	ret = recv_reply(sock, &reply, sizeof(reply));
+	if (ret < 0) {
+		ERR("Failed to receive relay daemon trace chunk close command reply");
+		goto end;
+	}
+
+	reply.ret_code = be32toh(reply.ret_code);
+	if (reply.ret_code != LTTNG_OK) {
+		ret = -1;
+		ERR("Relayd trace chunk close replied error %d",
+				reply.ret_code);
+	} else {
+		ret = 0;
+		DBG("Relayd successfully closed trace chunk: chunk_id = %" PRIu64,
+				chunk_id);
+	}
+end:
+	return ret;
+}