X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=fe1568382f3971728fb2a15fbc4b7bec348541d5;hb=3cc2f24a5cdabfbcb1022c0798f6b4845f72b498;hp=6bce96d96946abf263b9bad0bff0d6ff98d8dc49;hpb=43c34bc328e6970b298c9f5cd661e2ca648ebf16;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 6bce96d96..fe1568382 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -101,8 +101,8 @@ struct lttng_ust_lib_ring_buffer;
  * uniquely a stream.
  */
 struct lttng_consumer_stream {
+	/* Hash table node for both metadata and data type */
 	struct lttng_ht_node_ulong node;
-	struct lttng_ht_node_ulong waitfd_node;
 	struct lttng_consumer_channel *chan;	/* associated channel */
 	/*
 	 * key is the key used by the session daemon to refer to the
@@ -230,8 +230,8 @@ struct lttng_consumer_local_data {
 	/* communication with splice */
 	int consumer_thread_pipe[2];
 	int consumer_splice_metadata_pipe[2];
-	/* pipe to wake the poll thread when necessary */
-	int consumer_poll_pipe[2];
+	/* Data stream poll thread pipe. To transfer data stream to the thread */
+	int consumer_data_pipe[2];
 	/* to let the signal handler wake up the fd receiver thread */
 	int consumer_should_quit[2];
 	/* Metadata poll thread pipe. Transfer metadata stream to it */
@@ -253,13 +253,12 @@ struct lttng_consumer_global_data {
 	pthread_mutex_t lock;
 
 	/*
-	 * Number of streams in the hash table. Protected by consumer_data.lock.
+	 * Number of streams in the data stream hash table declared outside.
+	 * Protected by consumer_data.lock.
 	 */
 	int stream_count;
-	/*
-	 * Hash tables of streams and channels. Protected by consumer_data.lock.
-	 */
-	struct lttng_ht *stream_ht;
+
+	/* Channel hash table protected by consumer_data.lock. */
 	struct lttng_ht *channel_ht;
 	/*
 	 * Flag specifying if the local array of FDs needs update in the
@@ -344,8 +343,6 @@ extern void consumer_del_stream(struct lttng_consumer_stream *stream,
 		struct lttng_ht *ht);
 extern void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 		struct lttng_ht *ht);
-extern void consumer_change_stream_state(int stream_key,
-		enum lttng_consumer_stream_state state);
 extern void consumer_del_channel(struct lttng_consumer_channel *channel);
 extern struct lttng_consumer_channel *consumer_allocate_channel(
 		int channel_key,