X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=1bafeee07daccb79ef8f5377256ec6ed78257018;hp=718887971abb7b280565613b0b08643e8232304b;hb=ca22feea083301934d1c8511851c86fb008c0697;hpb=c869f647b0c4476645ab9ee01e362401fb8c1e42

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 718887971..1bafeee07 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -171,7 +171,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	case LTTNG_CONSUMER_ADD_STREAM:
 	{
 		struct lttng_consumer_stream *new_stream;
-		int fds[2];
+		int fds[2], stream_pipe;
 		size_t nb_fd = 2;
 		struct consumer_relayd_sock_pair *relayd = NULL;
 		int alloc_ret = 0;
@@ -205,6 +205,7 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 				msg.u.stream.gid,
 				msg.u.stream.net_index,
 				msg.u.stream.metadata_flag,
+				msg.u.stream.session_id,
 				&alloc_ret);
 		if (new_stream == NULL) {
 			switch (alloc_ret) {
@@ -253,30 +254,25 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			}
 		}
 
-		/* Send stream to the metadata thread */
+		/* Get the right pipe where the stream will be sent. */
 		if (new_stream->metadata_flag) {
-			do {
-				ret = write(ctx->consumer_metadata_pipe[1], &new_stream,
-						sizeof(new_stream));
-			} while (ret < 0 && errno == EINTR);
-			if (ret < 0) {
-				PERROR("write metadata pipe");
-				consumer_del_metadata_stream(new_stream, NULL);
-				goto end_nosignal;
-			}
+			stream_pipe = ctx->consumer_metadata_pipe[1];
 		} else {
-			do {
-				ret = write(ctx->consumer_poll_pipe[1], &new_stream,
-						sizeof(new_stream));
-			} while (ret < 0 && errno == EINTR);
-			if (ret < 0) {
-				PERROR("write data pipe");
-				consumer_del_stream(new_stream, NULL);
-				goto end_nosignal;
-			}
+			stream_pipe = ctx->consumer_data_pipe[1];
+		}
+
+		do {
+			ret = write(stream_pipe, &new_stream, sizeof(new_stream));
+		} while (ret < 0 && errno == EINTR);
+		if (ret < 0) {
+			PERROR("Consumer write %s stream to pipe %d",
+					new_stream->metadata_flag ? "metadata" : "data",
+					stream_pipe);
+			consumer_del_stream(new_stream, NULL);
+			goto end_nosignal;
 		}
 
-		DBG("UST consumer_add_stream %s (%d,%d) with relayd id %" PRIu64,
+		DBG("UST consumer ADD_STREAM %s (%d,%d) with relayd id %" PRIu64,
 				msg.u.stream.path_name, fds[0], fds[1],
 				new_stream->relayd_stream_id);
 		break;
@@ -313,20 +309,22 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	{
 		rcu_read_unlock();
 		return -ENOSYS;
-#if 0
-		if (ctx->on_update_stream != NULL) {
-			ret = ctx->on_update_stream(msg.u.stream.stream_key, msg.u.stream.state);
-			if (ret == 0) {
-				consumer_change_stream_state(msg.u.stream.stream_key, msg.u.stream.state);
-			} else if (ret < 0) {
-				goto end;
-			}
-		} else {
-			consumer_change_stream_state(msg.u.stream.stream_key,
-				msg.u.stream.state);
+	}
+	case LTTNG_CONSUMER_DATA_AVAILABLE:
+	{
+		int32_t ret;
+		uint64_t id = msg.u.data_available.session_id;
+
+		DBG("UST consumer data available command for id %" PRIu64, id);
+
+		ret = consumer_data_available(id);
+
+		/* Send back returned value to session daemon */
+		ret = lttcomm_send_unix_sock(sock, &ret, sizeof(ret));
+		if (ret < 0) {
+			PERROR("send data available ret code");
 		}
 		break;
-#endif
 	}
 	default:
 		break;
@@ -525,3 +523,43 @@ int lttng_ustconsumer_on_recv_stream(struct lttng_consumer_stream *stream)
 error:
 	return ret;
 }
+
+/*
+ * Check if data is still being extracted from the buffers for a specific
+ * stream. Consumer data lock MUST be acquired before calling this function.
+ *
+ * Return 0 if the traced data are still getting read else 1 meaning that the
+ * data is available for trace viewer reading.
+ */
+int lttng_ustconsumer_data_available(struct lttng_consumer_stream *stream)
+{
+	int ret;
+
+	assert(stream);
+
+	/*
+	 * Try to lock the stream mutex. On failure, we know that the stream is
+	 * being used else where hence there is data still being extracted.
+	 */
+	ret = pthread_mutex_trylock(&stream->lock);
+	if (ret == EBUSY) {
+		goto data_not_available;
+	}
+	/* The stream is now locked so we can do our ustctl calls */
+
+	ret = ustctl_get_next_subbuf(stream->chan->handle, stream->buf);
+	if (ret == 0) {
+		/* There is still data so let's put back this subbuffer. */
+		ret = ustctl_put_subbuf(stream->chan->handle, stream->buf);
+		assert(ret == 0);
+		pthread_mutex_unlock(&stream->lock);
+		goto data_not_available;
+	}
+
+	/* Data is available to be read for this stream. */
+	pthread_mutex_unlock(&stream->lock);
+	return 1;
+
+data_not_available:
+	return 0;
+}