X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=5a716859a386236fd480fbf1bb133b96a52012e7;hb=6d805429e9cb049eb0c9205fcf742a53e3166caf;hp=5886d89b598cab2f4d54aad2868e3172343eaac4;hpb=50f8ae690312d8f824fb9c9875b0a07f4a2547b6;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 5886d89b5..5a716859a 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -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) {
@@ -308,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_PENDING:
+	{
+		int32_t ret;
+		uint64_t id = msg.u.data_pending.session_id;
+
+		DBG("UST consumer data pending command for id %" PRIu64, id);
+
+		ret = consumer_data_pending(id);
+
+		/* Send back returned value to session daemon */
+		ret = lttcomm_send_unix_sock(sock, &ret, sizeof(ret));
+		if (ret < 0) {
+			PERROR("send data pending ret code");
 		}
 		break;
-#endif
 	}
 	default:
 		break;
@@ -520,3 +523,35 @@ 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
+ * and the stream lock.
+ *
+ * Return 1 if the traced data are still getting read else 0 meaning that the
+ * data is available for trace viewer reading.
+ */
+int lttng_ustconsumer_data_pending(struct lttng_consumer_stream *stream)
+{
+	int ret;
+
+	assert(stream);
+
+	DBG("UST consumer checking data pending");
+
+	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);
+		ret = 1;  /* Data is pending */
+		goto end;
+	}
+
+	/* Data is NOT pending so ready to be read. */
+	ret = 0;
+
+end:
+	return ret;
+}