X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=fe1568382f3971728fb2a15fbc4b7bec348541d5;hb=3cc2f24a5cdabfbcb1022c0798f6b4845f72b498;hp=9a93c427915bbd6de3aef1bdbc9440320244092a;hpb=c80048c6378b9ee7796c4b833a2c07f6050cc6d7;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 9a93c4279..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
@@ -275,6 +274,10 @@ struct lttng_consumer_global_data {
 	struct lttng_ht *relayd_ht;
 };
 
+/* Defined in consumer.c and coupled with explanations */
+extern struct lttng_ht *metadata_ht;
+extern struct lttng_ht *data_ht;
+
 /*
  * Init consumer data structures.
  */
@@ -324,10 +327,6 @@ extern void lttng_consumer_sync_trace_file(
  */
 extern int lttng_consumer_poll_socket(struct pollfd *kconsumer_sockpoll);
 
-extern int consumer_update_poll_array(
-		struct lttng_consumer_local_data *ctx, struct pollfd **pollfd,
-		struct lttng_consumer_stream **local_consumer_streams);
-
 extern struct lttng_consumer_stream *consumer_allocate_stream(
 		int channel_key, int stream_key,
 		int shm_fd, int wait_fd,
@@ -340,10 +339,10 @@ extern struct lttng_consumer_stream *consumer_allocate_stream(
 		int net_index,
 		int metadata_flag,
 		int *alloc_ret);
-extern int consumer_add_stream(struct lttng_consumer_stream *stream);
-extern void consumer_del_stream(struct lttng_consumer_stream *stream);
-extern void consumer_change_stream_state(int stream_key,
-		enum lttng_consumer_stream_state state);
+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_del_channel(struct lttng_consumer_channel *channel);
 extern struct lttng_consumer_channel *consumer_allocate_channel(
 		int channel_key,
@@ -359,6 +358,7 @@ struct consumer_relayd_sock_pair *consumer_allocate_relayd_sock_pair(
 struct consumer_relayd_sock_pair *consumer_find_relayd(int key);
 int consumer_handle_stream_before_relayd(struct lttng_consumer_stream *stream,
 		size_t data_size);
+void consumer_steal_stream_key(int key, struct lttng_ht *ht);
 
 extern struct lttng_consumer_local_data *lttng_consumer_create(
 		enum lttng_consumer_type type,
@@ -382,8 +382,9 @@ extern int lttng_consumer_get_produced_snapshot(
 		struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *stream,
 		unsigned long *pos);
-extern void *lttng_consumer_thread_poll_fds(void *data);
-extern void *lttng_consumer_thread_receive_fds(void *data);
+extern void *consumer_thread_metadata_poll(void *data);
+extern void *consumer_thread_data_poll(void *data);
+extern void *consumer_thread_sessiond_poll(void *data);
 extern int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		int sock, struct pollfd *consumer_sockpoll);