X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=f72d4bb17a3c353a31b4f55ac49aaedc87744eef;hp=d1417efd76e52409be5573497d3ad0010b849ad9;hb=4b35a6b3dbbaf925b2cb95ab36bef3546334607a;hpb=e09272cd700e3a0a59100cdf6c3ad2332341109c

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index d1417efd7..f72d4bb17 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -522,12 +522,6 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 	int ret;
 	struct lttcomm_sock *sock = NULL;
 
-	/* Don't resend the sockets to the consumer. */
-	if (consumer->dst.net.relayd_socks_sent) {
-		ret = LTTNG_OK;
-		goto error;
-	}
-
 	/* Set the network sequence index if not set. */
 	if (consumer->net_seq_index == -1) {
 		/*
@@ -559,6 +553,13 @@ static int send_consumer_relayd_socket(int domain, struct ltt_session *session,
 		goto close_sock;
 	}
 
+	/* Flag that the corresponding socket was sent. */
+	if (relayd_uri->stype == LTTNG_STREAM_CONTROL) {
+		consumer->dst.net.control_sock_sent = 1;
+	} else if (relayd_uri->stype == LTTNG_STREAM_DATA) {
+		consumer->dst.net.data_sock_sent = 1;
+	}
+
 	ret = LTTNG_OK;
 
 	/*
@@ -572,7 +573,6 @@ close_sock:
 		lttcomm_destroy_sock(sock);
 	}
 
-error:
 	return ret;
 }
 
@@ -589,29 +589,24 @@ static int send_consumer_relayd_sockets(int domain,
 	assert(session);
 	assert(consumer);
 
-	/* Don't resend the sockets to the consumer. */
-	if (consumer->dst.net.relayd_socks_sent) {
-		ret = LTTNG_OK;
-		goto error;
-	}
-
 	/* Sending control relayd socket. */
-	ret = send_consumer_relayd_socket(domain, session,
-			&consumer->dst.net.control, consumer, fd);
-	if (ret != LTTNG_OK) {
-		goto error;
+	if (!consumer->dst.net.control_sock_sent) {
+		ret = send_consumer_relayd_socket(domain, session,
+				&consumer->dst.net.control, consumer, fd);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
 	}
 
 	/* Sending data relayd socket. */
-	ret = send_consumer_relayd_socket(domain, session,
-			&consumer->dst.net.data, consumer, fd);
-	if (ret != LTTNG_OK) {
-		goto error;
+	if (!consumer->dst.net.data_sock_sent) {
+		ret = send_consumer_relayd_socket(domain, session,
+				&consumer->dst.net.data, consumer, fd);
+		if (ret != LTTNG_OK) {
+			goto error;
+		}
 	}
 
-	/* Flag that all relayd sockets were sent to the consumer. */
-	consumer->dst.net.relayd_socks_sent = 1;
-
 error:
 	return ret;
 }
@@ -1533,11 +1528,6 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 		goto error;
 	}
 
-	if (!session->start_consumer) {
-		ret = LTTNG_ERR_NO_CONSUMER;
-		goto error;
-	}
-
 	/*
 	 * This case switch makes sure the domain session has a temporary consumer
 	 * so the URL can be set.
@@ -1601,10 +1591,13 @@ int cmd_set_consumer_uri(int domain, struct ltt_session *session,
 
 		/*
 		 * Don't send relayd socket if URI is NOT remote or if the relayd
-		 * sockets for the session are already sent.
+		 * socket for the session was already sent.
 		 */
 		if (uris[i].dtype == LTTNG_DST_PATH ||
-				consumer->dst.net.relayd_socks_sent) {
+				(uris[i].stype == LTTNG_STREAM_CONTROL &&
+				consumer->dst.net.control_sock_sent) ||
+				(uris[i].stype == LTTNG_STREAM_DATA &&
+				consumer->dst.net.data_sock_sent)) {
 			continue;
 		}
 
@@ -2144,11 +2137,6 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 		goto error;
 	}
 
-	if (!session->start_consumer) {
-		ret = LTTNG_ERR_NO_CONSUMER;
-		goto error;
-	}
-
 	switch (domain) {
 	case 0:
 		assert(session->consumer);
@@ -2322,6 +2310,8 @@ int cmd_enable_consumer(int domain, struct ltt_session *session)
 		break;
 	}
 
+	session->start_consumer = 1;
+
 	/* Enable it */
 	if (consumer) {
 		consumer->enabled = 1;
@@ -2336,6 +2326,47 @@ error:
 	return ret;
 }
 
+/*
+ * Command LTTNG_DATA_AVAILABLE returning 0 if the data is NOT ready to be read
+ * or else 1 if the data is available for trace analysis.
+ */
+int cmd_data_available(struct ltt_session *session)
+{
+	int ret;
+	struct ltt_kernel_session *ksess = session->kernel_session;
+	struct ltt_ust_session *usess = session->ust_session;
+
+	assert(session);
+
+	/* Session MUST be stopped to ask for data availability. */
+	if (session->enabled) {
+		ret = LTTNG_ERR_SESSION_STARTED;
+		goto error;
+	}
+
+	if (ksess && ksess->consumer) {
+		ret = consumer_is_data_available(ksess->id, ksess->consumer);
+		if (ret == 0) {
+			/* Data is still being extracted for the kernel. */
+			goto error;
+		}
+	}
+
+	if (usess && usess->consumer) {
+		ret = consumer_is_data_available(usess->id, usess->consumer);
+		if (ret == 0) {
+			/* Data is still being extracted for the kernel. */
+			goto error;
+		}
+	}
+
+	/* Data is ready to be read by a viewer */
+	ret = 1;
+
+error:
+	return ret;
+}
+
 /*
  * Init command subsystem.
  */