X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=1d4f9264eb0a57e4aedfa595767b1478b9402a4f;hb=806e2684ce24d3772af37ee46c5f0500c7a0723f;hp=460f1d69fda2672cadbcb35a2992d4ba2a208a1c;hpb=f73fabfda365d22e7dd180fb1614e37c446fbd9e;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 460f1d69f..1d4f9264e 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -553,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;
 
 	/*
@@ -582,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;
 }
@@ -1594,10 +1596,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;
 		}
 
@@ -1928,6 +1933,9 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 			nb_chan = session->kernel_session->channel_count;
 		}
 		DBG3("Number of kernel channels %zd", nb_chan);
+		if (nb_chan <= 0) {
+			ret = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
+		}
 		break;
 	case LTTNG_DOMAIN_UST:
 		if (session->ust_session != NULL) {
@@ -1935,6 +1943,9 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 					session->ust_session->domain_global.channels);
 		}
 		DBG3("Number of UST global channels %zd", nb_chan);
+		if (nb_chan <= 0) {
+			ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+		}
 		break;
 	default:
 		*channels = NULL;
@@ -1952,6 +1963,8 @@ ssize_t cmd_list_channels(int domain, struct ltt_session *session,
 		list_lttng_channels(domain, session, *channels);
 	} else {
 		*channels = NULL;
+		/* Ret value was set in the domain switch case */
+		goto error;
 	}
 
 	return nb_chan;
@@ -2321,6 +2334,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.
  */