X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=745bde816aa7471222f871c3859d981389e22638;hp=1f427e0e25cb8e1d2e502760294918be10a5172d;hb=272839375cd306a6a824bab1018655a65b39fd9d;hpb=7d2f74525fbda4dcc744f33ea26c911545b5df13

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 1f427e0e2..745bde816 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -15,7 +15,7 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,8 +25,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/lttng-index.h>
+#include <common/index/ctf-index.h>
 
 #include "relayd.h"
 
@@ -34,7 +36,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;
@@ -57,6 +59,7 @@ static int send_command(struct lttcomm_relayd_sock *rsock,
 		goto alloc_error;
 	}
 
+	memset(&header, 0, sizeof(header));
 	header.cmd = htobe32(cmd);
 	header.data_size = htobe64(size);
 
@@ -70,14 +73,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:
@@ -117,18 +120,80 @@ 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,
+		char *session_name, char *hostname,
+		int session_live_timer, unsigned int snapshot)
+{
+	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;
+
+	/* 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,
-		int session_live_timer, unsigned int snapshot)
+		char *session_name, char *hostname, int session_live_timer,
+		unsigned int snapshot)
 {
 	int ret;
 	struct lttcomm_relayd_create_session_2_4 msg;
 
-	strncpy(msg.session_name, session_name, sizeof(msg.session_name));
-	strncpy(msg.hostname, hostname, sizeof(msg.hostname));
+	if (lttng_strncpy(msg.session_name, session_name,
+			sizeof(msg.session_name))) {
+		ret = -1;
+		goto error;
+	}
+	if (lttng_strncpy(msg.hostname, hostname, sizeof(msg.hostname))) {
+		ret = -1;
+		goto error;
+	}
 	msg.live_timer = htobe32(session_live_timer);
 	msg.snapshot = htobe32(snapshot);
 
@@ -145,8 +210,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;
 
@@ -179,15 +243,17 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
 
 	DBG("Relayd create session");
 
-	switch(rsock->minor) {
-		case 1:
-		case 2:
-		case 3:
-			ret = relayd_create_session_2_1(rsock, session_id);
-		case 4:
-		default:
-			ret = relayd_create_session_2_4(rsock, session_id, session_name,
-					hostname, session_live_timer, snapshot);
+	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);
 	}
 
 	if (ret < 0) {
@@ -219,6 +285,119 @@ 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)
+{
+	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);
+
+	/* 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.
  *
@@ -226,11 +405,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,
+		uint64_t trace_archive_id)
 {
 	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. */
@@ -242,26 +420,22 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 
 	/* Compat with relayd 2.1 */
 	if (rsock->minor == 1) {
-		strncpy(msg.channel_name, channel_name, sizeof(msg.channel_name));
-		strncpy(msg.pathname, pathname, sizeof(msg.pathname));
-
-		/* Send command */
-		ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
-		if (ret < 0) {
-			goto error;
-		}
+		/* For 2.1 */
+		ret = relayd_add_stream_2_1(rsock, channel_name, pathname);
+	
+	} else if (rsock->minor > 1 && rsock->minor < 11) {
+		/* From 2.2 to 2.10 */
+		ret = relayd_add_stream_2_2(rsock, channel_name, pathname,
+				tracefile_size, tracefile_count);
 	} else {
-		/* Compat with relayd 2.2+ */
-		strncpy(msg_2_2.channel_name, channel_name, sizeof(msg_2_2.channel_name));
-		strncpy(msg_2_2.pathname, pathname, sizeof(msg_2_2.pathname));
-		msg_2_2.tracefile_size = htobe64(tracefile_size);
-		msg_2_2.tracefile_count = htobe64(tracefile_count);
-
-		/* Send command */
-		ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg_2_2, sizeof(msg_2_2), 0);
-		if (ret < 0) {
-			goto error;
-		}
+		/* From 2.11 to ...*/
+		ret = relayd_add_stream_2_11(rsock, channel_name, pathname,
+				tracefile_size, tracefile_count);
+	}
+
+	if (ret) {
+		ret = -1;
+		goto error;
 	}
 
 	/* Waiting for reply */
@@ -285,18 +459,72 @@ 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;
 }
 
+/*
+ * Inform the relay that all the streams for the current channel has been sent.
+ *
+ * On success return 0 else return ret_code negative value.
+ */
+int relayd_streams_sent(struct lttcomm_relayd_sock *rsock)
+{
+	int ret;
+	struct lttcomm_relayd_generic_reply reply;
+
+	/* Code flow error. Safety net. */
+	assert(rsock);
+
+	DBG("Relayd sending streams sent.");
+
+	/* This feature was introduced in 2.4, ignore it for earlier versions. */
+	if (rsock->minor < 4) {
+		ret = 0;
+		goto end;
+	}
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_STREAMS_SENT, NULL, 0, 0);
+	if (ret < 0) {
+		goto error;
+	}
+
+	/* Waiting for reply */
+	ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+	if (ret < 0) {
+		goto error;
+	}
+
+	/* Back to host bytes order. */
+	reply.ret_code = be32toh(reply.ret_code);
+
+	/* Return session id or negative ret code. */
+	if (reply.ret_code != LTTNG_OK) {
+		ret = -1;
+		ERR("Relayd streams sent replied error %d", reply.ret_code);
+		goto error;
+	} else {
+		/* Success */
+		ret = 0;
+	}
+
+	DBG("Relayd streams sent success");
+
+error:
+end:
+	return ret;
+}
+
 /*
  * Check version numbers on the relayd.
  * If major versions are compatible, we assign minor_to_use to the
  * minor version of the procotol we are going to use for this session.
  *
- * Return 0 if compatible else negative value.
+ * Return 0 if the two daemons are compatible, LTTNG_ERR_RELAYD_VERSION_FAIL
+ * otherwise, or a negative value on network errors.
  */
 int relayd_version_check(struct lttcomm_relayd_sock *rsock)
 {
@@ -309,6 +537,7 @@ int relayd_version_check(struct lttcomm_relayd_sock *rsock)
 	DBG("Relayd version check for major.minor %u.%u", rsock->major,
 			rsock->minor);
 
+	memset(&msg, 0, sizeof(msg));
 	/* Prepare network byte order before transmission. */
 	msg.major = htobe32(rsock->major);
 	msg.minor = htobe32(rsock->minor);
@@ -337,7 +566,7 @@ int relayd_version_check(struct lttcomm_relayd_sock *rsock)
 	 */
 	if (msg.major != rsock->major) {
 		/* Not compatible */
-		ret = -1;
+		ret = LTTNG_ERR_RELAYD_VERSION_FAIL;
 		DBG2("Relayd version is NOT compatible. Relayd version %u != %u (us)",
 				msg.major, rsock->major);
 		goto error;
@@ -510,6 +739,7 @@ int relayd_send_close_stream(struct lttcomm_relayd_sock *rsock, uint64_t stream_
 
 	DBG("Relayd closing stream id %" PRIu64, stream_id);
 
+	memset(&msg, 0, sizeof(msg));
 	msg.stream_id = htobe64(stream_id);
 	msg.last_net_seq_num = htobe64(last_net_seq_num);
 
@@ -559,6 +789,7 @@ int relayd_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t stream_id,
 
 	DBG("Relayd data pending for stream id %" PRIu64, stream_id);
 
+	memset(&msg, 0, sizeof(msg));
 	msg.stream_id = htobe64(stream_id);
 	msg.last_net_seq_num = htobe64(last_net_seq_num);
 
@@ -607,6 +838,7 @@ int relayd_quiescent_control(struct lttcomm_relayd_sock *rsock,
 
 	DBG("Relayd checking quiescent control state");
 
+	memset(&msg, 0, sizeof(msg));
 	msg.stream_id = htobe64(metadata_stream_id);
 
 	/* Send command */
@@ -651,6 +883,7 @@ int relayd_begin_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id)
 
 	DBG("Relayd begin data pending");
 
+	memset(&msg, 0, sizeof(msg));
 	msg.session_id = htobe64(id);
 
 	/* Send command */
@@ -689,7 +922,7 @@ error:
 int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
 		unsigned int *is_data_inflight)
 {
-	int ret;
+	int ret, recv_ret;
 	struct lttcomm_relayd_end_data_pending msg;
 	struct lttcomm_relayd_generic_reply reply;
 
@@ -698,6 +931,7 @@ int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
 
 	DBG("Relayd end data pending");
 
+	memset(&msg, 0, sizeof(msg));
 	msg.session_id = htobe64(id);
 
 	/* Send command */
@@ -712,15 +946,15 @@ int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
 		goto error;
 	}
 
-	reply.ret_code = be32toh(reply.ret_code);
-	if (reply.ret_code < 0) {
-		ret = reply.ret_code;
+	recv_ret = be32toh(reply.ret_code);
+	if (recv_ret < 0) {
+		ret = recv_ret;
 		goto error;
 	}
 
-	*is_data_inflight = reply.ret_code;
+	*is_data_inflight = recv_ret;
 
-	DBG("Relayd end data pending is data inflight: %d", reply.ret_code);
+	DBG("Relayd end data pending is data inflight: %d", recv_ret);
 
 	return 0;
 
@@ -732,7 +966,7 @@ error:
  * Send index to the relayd.
  */
 int relayd_send_index(struct lttcomm_relayd_sock *rsock,
-		struct lttng_packet_index *index, uint64_t relay_stream_id,
+		struct ctf_packet_index *index, uint64_t relay_stream_id,
 		uint64_t net_seq_num)
 {
 	int ret;
@@ -750,6 +984,7 @@ int relayd_send_index(struct lttcomm_relayd_sock *rsock,
 
 	DBG("Relayd sending index for stream ID %" PRIu64, relay_stream_id);
 
+	memset(&msg, 0, sizeof(msg));
 	msg.relay_stream_id = htobe64(relay_stream_id);
 	msg.net_seq_num = htobe64(net_seq_num);
 
@@ -761,8 +996,17 @@ int relayd_send_index(struct lttcomm_relayd_sock *rsock,
 	msg.events_discarded = index->events_discarded;
 	msg.stream_id = index->stream_id;
 
+	if (rsock->minor >= 8) {
+		msg.stream_instance_id = index->stream_instance_id;
+		msg.packet_seq_num = index->packet_seq_num;
+	}
+
 	/* Send command */
-	ret = send_command(rsock, RELAYD_SEND_INDEX, &msg, sizeof(msg), 0);
+	ret = send_command(rsock, RELAYD_SEND_INDEX, &msg,
+		lttcomm_relayd_index_len(lttng_to_index_major(rsock->major,
+								rsock->minor),
+				lttng_to_index_minor(rsock->major, rsock->minor)),
+				0);
 	if (ret < 0) {
 		goto error;
 	}
@@ -787,3 +1031,309 @@ int relayd_send_index(struct lttcomm_relayd_sock *rsock,
 error:
 	return ret;
 }
+
+/*
+ * Ask the relay to reset the metadata trace file (regeneration).
+ */
+int relayd_reset_metadata(struct lttcomm_relayd_sock *rsock,
+		uint64_t stream_id, uint64_t version)
+{
+	int ret;
+	struct lttcomm_relayd_reset_metadata msg;
+	struct lttcomm_relayd_generic_reply reply;
+
+	/* Code flow error. Safety net. */
+	assert(rsock);
+
+	/* Should have been prevented by the sessiond. */
+	if (rsock->minor < 8) {
+		ERR("Metadata regeneration unsupported before 2.8");
+		ret = -1;
+		goto error;
+	}
+
+	DBG("Relayd reset metadata stream id %" PRIu64, stream_id);
+
+	memset(&msg, 0, sizeof(msg));
+	msg.stream_id = htobe64(stream_id);
+	msg.version = htobe64(version);
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_RESET_METADATA, (void *) &msg, sizeof(msg), 0);
+	if (ret < 0) {
+		goto error;
+	}
+
+	/* Receive response */
+	ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+	if (ret < 0) {
+		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 reset metadata replied error %d", reply.ret_code);
+	} else {
+		/* Success */
+		ret = 0;
+	}
+
+	DBG("Relayd reset metadata stream id %" PRIu64 " successfully", stream_id);
+
+error:
+	return ret;
+}
+
+int relayd_rotate_stream(struct lttcomm_relayd_sock *rsock, uint64_t stream_id,
+		const char *new_pathname, 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;
+
+	/* 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_rotate_rename(struct lttcomm_relayd_sock *rsock,
+		const char *old_path, const char *new_path)
+{
+	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);
+
+	/* 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;
+
+	msg_length = sizeof(*msg) + old_path_length + new_path_length;
+	msg = zmalloc(msg_length);
+	if (!msg) {
+		PERROR("zmalloc rotate-rename command message");
+		ret = -1;
+		goto error;
+	}
+
+	assert(old_path_length <= UINT32_MAX);
+	msg->old_path_length = htobe32(old_path_length);
+
+	assert(new_path_length <= UINT32_MAX);
+	msg->new_path_length = htobe32(new_path_length);
+
+	strcpy(msg->paths, old_path);
+	strcpy(msg->paths + old_path_length, new_path);
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_ROTATE_RENAME, (const void *) msg,
+			msg_length, 0);
+	if (ret < 0) {
+		goto error;
+	}
+
+	/* Receive response */
+	ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+	if (ret < 0) {
+		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 rename replied error %d", reply.ret_code);
+	} else {
+		/* Success */
+		ret = 0;
+	}
+
+	DBG("Relayd rotate rename completed successfully");
+
+error:
+	free(msg);
+	return ret;
+}
+
+int relayd_rotate_pending(struct lttcomm_relayd_sock *rsock, uint64_t chunk_id)
+{
+	int ret;
+	struct lttcomm_relayd_rotate_pending msg;
+	struct lttcomm_relayd_rotate_pending_reply reply;
+
+	/* Code flow error. Safety net. */
+	assert(rsock);
+
+	DBG("Querying relayd for rotate pending with chunk_id %" PRIu64,
+			chunk_id);
+
+	memset(&msg, 0, sizeof(msg));
+	msg.chunk_id = htobe64(chunk_id);
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_ROTATE_PENDING, (void *) &msg,
+			sizeof(msg), 0);
+	if (ret < 0) {
+		goto error;
+	}
+
+	/* Receive response */
+	ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+	if (ret < 0) {
+		goto error;
+	}
+
+	reply.generic.ret_code = be32toh(reply.generic.ret_code);
+
+	/* Return session id or negative 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;
+	} 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;
+		}
+	}
+
+error:
+	return ret;
+}
+
+int relayd_mkdir(struct lttcomm_relayd_sock *rsock, const char *path)
+{
+	int ret;
+	struct lttcomm_relayd_mkdir *msg;
+	struct lttcomm_relayd_generic_reply reply;
+	size_t len;
+
+	/* Code flow error. Safety net. */
+	assert(rsock);
+
+	DBG("Relayd mkdir path %s", path);
+
+	len = strlen(path) + 1;
+	msg = zmalloc(sizeof(msg->length) + len);
+	if (!msg) {
+		PERROR("Alloc mkdir msg");
+		ret = -1;
+		goto error;
+	}
+	msg->length = htobe32((uint32_t) len);
+
+	if (lttng_strncpy(msg->path, path, len)) {
+		ret = -1;
+		goto error;
+	}
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_MKDIR, (void *) msg,
+			sizeof(msg->length) + len, 0);
+	if (ret < 0) {
+		goto error;
+	}
+
+	/* Receive response */
+	ret = recv_reply(rsock, (void *) &reply, sizeof(reply));
+	if (ret < 0) {
+		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 mkdir replied error %d", reply.ret_code);
+	} else {
+		/* Success */
+		ret = 0;
+	}
+
+	DBG("Relayd mkdir completed successfully");
+
+error:
+	free(msg);
+	return ret;
+}