X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=a4c8a9261c29a9e58fc96e3023a68d8da8c44d68;hb=efc8a87fb1ec94af764008a13b3576e793ae288c;hp=aa3f7685300bdd175abd5492c3cb66f6a75283e5;hpb=8fd623e0d1c389a76e4dc3ee74a77490b678c5b8;p=lttng-tools.git

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index aa3f76853..a4c8a9261 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -26,6 +26,7 @@
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/sessiond-comm/relayd.h>
+#include <common/index/lttng-index.h>
 
 #include "relayd.h"
 
@@ -41,6 +42,10 @@ static int send_command(struct lttcomm_relayd_sock *rsock,
 	char *buf;
 	uint64_t buf_size = sizeof(header);
 
+	if (rsock->sock.fd < 0) {
+		return -ECONNRESET;
+	}
+
 	if (data) {
 		buf_size += size;
 	}
@@ -87,6 +92,10 @@ static int recv_reply(struct lttcomm_relayd_sock *rsock, void *data, size_t size
 {
 	int ret;
 
+	if (rsock->sock.fd < 0) {
+		return -ECONNRESET;
+	}
+
 	DBG3("Relayd waiting for reply of size %zu", size);
 
 	ret = rsock->sock.ops->recvmsg(&rsock->sock, data, size, 0);
@@ -107,6 +116,49 @@ error:
 	return ret;
 }
 
+/*
+ * Starting at 2.4, 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)
+{
+	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));
+	msg.live_timer = htobe32(session_live_timer);
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_CREATE_SESSION, &msg, sizeof(msg), 0);
+	if (ret < 0) {
+		goto error;
+	}
+
+error:
+	return ret;
+}
+
+/*
+ * 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)
+{
+	int ret;
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_CREATE_SESSION, NULL, 0, 0);
+	if (ret < 0) {
+		goto error;
+	}
+
+error:
+	return ret;
+}
+
 /*
  * Send a RELAYD_CREATE_SESSION command to the relayd with the given socket and
  * set session_id of the relayd if we have a successful reply from the relayd.
@@ -114,7 +166,8 @@ 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)
+int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_id,
+		char *session_name, char *hostname, int session_live_timer)
 {
 	int ret;
 	struct lttcomm_relayd_status_session reply;
@@ -124,8 +177,18 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock, uint64_t *session_i
 
 	DBG("Relayd create session");
 
-	/* Send command */
-	ret = send_command(rsock, RELAYD_CREATE_SESSION, NULL, 0, 0);
+	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);
+	}
+
 	if (ret < 0) {
 		goto error;
 	}
@@ -337,6 +400,13 @@ int relayd_connect(struct lttcomm_relayd_sock *rsock)
 	/* Code flow error. Safety net. */
 	assert(rsock);
 
+	if (!rsock->sock.ops) {
+		/*
+		 * Attempting a connect on a non-initialized socket.
+		 */
+		return -ECONNRESET;
+	}
+
 	DBG3("Relayd connect ...");
 
 	return rsock->sock.ops->connect(&rsock->sock);
@@ -379,6 +449,7 @@ int relayd_close(struct lttcomm_relayd_sock *rsock)
 			PERROR("relayd_close default close");
 		}
 	}
+	rsock->sock.fd = -1;
 
 end:
 	return ret;
@@ -396,6 +467,10 @@ int relayd_send_data_hdr(struct lttcomm_relayd_sock *rsock,
 	assert(rsock);
 	assert(hdr);
 
+	if (rsock->sock.fd < 0) {
+		return -ECONNRESET;
+	}
+
 	DBG3("Relayd sending data header of size %zu", size);
 
 	/* Again, safety net */
@@ -651,3 +726,63 @@ int relayd_end_data_pending(struct lttcomm_relayd_sock *rsock, uint64_t id,
 error:
 	return ret;
 }
+
+/*
+ * Send index to the relayd.
+ */
+int relayd_send_index(struct lttcomm_relayd_sock *rsock,
+		struct lttng_packet_index *index, uint64_t relay_stream_id,
+		uint64_t net_seq_num)
+{
+	int ret;
+	struct lttcomm_relayd_index msg;
+	struct lttcomm_relayd_generic_reply reply;
+
+	/* Code flow error. Safety net. */
+	assert(rsock);
+
+	if (rsock->minor < 4) {
+		DBG("Not sending indexes before protocol 2.4");
+		ret = 0;
+		goto error;
+	}
+
+	DBG("Relayd sending index for stream ID %" PRIu64, relay_stream_id);
+
+	msg.relay_stream_id = htobe64(relay_stream_id);
+	msg.net_seq_num = htobe64(net_seq_num);
+
+	/* The index is already in big endian. */
+	msg.packet_size = index->packet_size;
+	msg.content_size = index->content_size;
+	msg.timestamp_begin = index->timestamp_begin;
+	msg.timestamp_end = index->timestamp_end;
+	msg.events_discarded = index->events_discarded;
+	msg.stream_id = index->stream_id;
+
+	/* Send command */
+	ret = send_command(rsock, RELAYD_SEND_INDEX, &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 send index replied error %d", reply.ret_code);
+	} else {
+		/* Success */
+		ret = 0;
+	}
+
+error:
+	return ret;
+}