X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=8d1a34025687da37b7c3c1555d80441c93d8761d;hp=464198597b8cc9ece7ee00d465077cbe757eb00c;hb=ca22feea083301934d1c8511851c86fb008c0697;hpb=aefea3b7b1a1e7255becc0de1b0eac73d6798bed

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 464198597..8d1a34025 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -281,6 +281,11 @@ void consumer_del_stream(struct lttng_consumer_stream *stream,
 	iter.iter.node = &stream->node.node;
 	ret = lttng_ht_del(ht, &iter);
 	assert(!ret);
+
+	/* Remove node session id from the consumer_data stream ht */
+	iter.iter.node = &stream->node_session_id.node;
+	ret = lttng_ht_del(consumer_data.stream_list_ht, &iter);
+	assert(!ret);
 	rcu_read_unlock();
 
 	assert(consumer_data.stream_count > 0);
@@ -462,6 +467,13 @@ static int consumer_add_stream(struct lttng_consumer_stream *stream,
 
 	lttng_ht_add_unique_ulong(ht, &stream->node);
 
+	/*
+	 * Add stream to the stream_list_ht of the consumer data. No need to steal
+	 * the key since the HT does not use it and we allow to add redundant keys
+	 * into this table.
+	 */
+	lttng_ht_add_ulong(consumer_data.stream_list_ht, &stream->node_session_id);
+
 	/* Check and cleanup relayd */
 	relayd = consumer_find_relayd(stream->net_seq_idx);
 	if (relayd != NULL) {
@@ -1606,6 +1618,11 @@ void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 	iter.iter.node = &stream->node.node;
 	ret = lttng_ht_del(ht, &iter);
 	assert(!ret);
+
+	/* Remove node session id from the consumer_data stream ht */
+	iter.iter.node = &stream->node_session_id.node;
+	ret = lttng_ht_del(consumer_data.stream_list_ht, &iter);
+	assert(!ret);
 	rcu_read_unlock();
 
 	if (stream->out_fd >= 0) {
@@ -1724,6 +1741,14 @@ static int consumer_add_metadata_stream(struct lttng_consumer_stream *stream,
 	consumer_steal_stream_key(stream->key, ht);
 
 	lttng_ht_add_unique_ulong(ht, &stream->node);
+
+	/*
+	 * Add stream to the stream_list_ht of the consumer data. No need to steal
+	 * the key since the HT does not use it and we allow to add redundant keys
+	 * into this table.
+	 */
+	lttng_ht_add_ulong(consumer_data.stream_list_ht, &stream->node_session_id);
+
 	rcu_read_unlock();
 
 	pthread_mutex_unlock(&consumer_data.lock);
@@ -2413,3 +2438,66 @@ int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
 error:
 	return ret;
 }
+
+/*
+ * Check if for a given session id there is still data needed to be extract
+ * from the buffers.
+ *
+ * Return 1 if data is in fact available to be read or else 0.
+ */
+int consumer_data_available(uint64_t id)
+{
+	int ret;
+	struct lttng_ht_iter iter;
+	struct lttng_ht *ht;
+	struct lttng_consumer_stream *stream;
+	int (*data_available)(struct lttng_consumer_stream *);
+
+	DBG("Consumer data available command on session id %" PRIu64, id);
+
+	pthread_mutex_lock(&consumer_data.lock);
+
+	switch (consumer_data.type) {
+	case LTTNG_CONSUMER_KERNEL:
+		data_available = lttng_kconsumer_data_available;
+		break;
+	case LTTNG_CONSUMER32_UST:
+	case LTTNG_CONSUMER64_UST:
+		data_available = lttng_ustconsumer_data_available;
+		break;
+	default:
+		ERR("Unknown consumer data type");
+		assert(0);
+	}
+
+	/* Ease our life a bit */
+	ht = consumer_data.stream_list_ht;
+
+	cds_lfht_for_each_entry_duplicate(ht->ht, (long unsigned int) ht->hash_fct,
+			ht->match_fct, (void *)((unsigned long) id),
+			&iter.iter, stream, node_session_id.node) {
+		/* Check the stream for data. */
+		ret = data_available(stream);
+		if (ret == 0) {
+			goto data_not_available;
+		}
+	}
+
+	/* TODO: Support to ask the relayd if the streams are remote */
+
+	/*
+	 * Finding _no_ node in the hash table means that the stream(s) have been
+	 * removed thus data is guaranteed to be available for analysis from the
+	 * trace files. This is *only* true for local consumer and not network
+	 * streaming.
+	 */
+
+	/* Data is available to be read by a viewer. */
+	pthread_mutex_unlock(&consumer_data.lock);
+	return 1;
+
+data_not_available:
+	/* Data is still being extracted from buffers. */
+	pthread_mutex_unlock(&consumer_data.lock);
+	return 0;
+}