X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=46387522ec50c8a9509077f88a06213ef8c7c22e;hp=a3e1ec3535094f169042d1bd70dae73fc19d5f58;hb=331744e34f56a5aec69b05d356d6901e67926acc;hpb=d88aee689d5bd0067f362a323cb69c37717df59f

diff --git a/src/common/consumer.h b/src/common/consumer.h
index a3e1ec353..46387522e 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -52,6 +52,7 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_PUSH_METADATA,
 	LTTNG_CONSUMER_CLOSE_METADATA,
 	LTTNG_CONSUMER_SETUP_METADATA,
+	LTTNG_CONSUMER_FLUSH_CHANNEL,
 };
 
 /* State of each fd in consumer */
@@ -88,6 +89,9 @@ struct stream_list {
 	unsigned int count;
 };
 
+/* Stub. */
+struct consumer_metadata_cache;
+
 struct lttng_consumer_channel {
 	/* HT node used for consumer_data.channel_ht */
 	struct lttng_ht_node_u64 node;
@@ -131,11 +135,17 @@ struct lttng_consumer_channel {
 	 * regular channel, this is always set to NULL.
 	 */
 	struct lttng_consumer_stream *metadata_stream;
-	/*
-	 * Metadata written so far. Helps keeping track of
-	 * contiguousness and order.
-	 */
-	uint64_t contig_metadata_written;
+
+	/* for UST */
+	int wait_fd;
+	/* Node within channel thread ht */
+	struct lttng_ht_node_u64 wait_fd_node;
+
+	/* Metadata cache is metadata channel */
+	struct consumer_metadata_cache *metadata_cache;
+	/* For metadata periodical flush */
+	int switch_timer_enabled;
+	timer_t switch_timer;
 };
 
 /*
@@ -145,6 +155,8 @@ struct lttng_consumer_channel {
 struct lttng_consumer_stream {
 	/* HT node used by the data_ht and metadata_ht */
 	struct lttng_ht_node_u64 node;
+	/* stream indexed per channel key node */
+	struct lttng_ht_node_u64 node_channel_id;
 	/* HT node used in consumer_data.stream_list_ht */
 	struct lttng_ht_node_u64 node_session_id;
 	/* Pointer to associated channel. */
@@ -314,12 +326,16 @@ struct lttng_consumer_local_data {
 	 *    < 0 (error)
 	 */
 	int (*on_update_stream)(int sessiond_key, uint32_t state);
+	enum lttng_consumer_type type;
 	/* socket to communicate errors with sessiond */
 	int consumer_error_socket;
+	/* socket to ask metadata to sessiond */
+	int consumer_metadata_socket;
 	/* socket to exchange commands with sessiond */
 	char *consumer_command_sock_path;
 	/* communication with splice */
 	int consumer_thread_pipe[2];
+	int consumer_channel_pipe[2];
 	int consumer_splice_metadata_pipe[2];
 	/* Data stream poll thread pipe. To transfer data stream to the thread */
 	int consumer_data_pipe[2];
@@ -372,6 +388,11 @@ struct lttng_consumer_global_data {
 	 * This HT uses the "node_session_id" of the consumer stream.
 	 */
 	struct lttng_ht *stream_list_ht;
+
+	/*
+	 * This HT uses the "node_channel_id" of the consumer stream.
+	 */
+	struct lttng_ht *stream_per_chan_id_ht;
 };
 
 /*
@@ -444,7 +465,8 @@ void consumer_del_stream(struct lttng_consumer_stream *stream,
 		struct lttng_ht *ht);
 void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
 		struct lttng_ht *ht);
-int consumer_add_channel(struct lttng_consumer_channel *channel);
+int consumer_add_channel(struct lttng_consumer_channel *channel,
+		struct lttng_consumer_local_data *ctx);
 void consumer_del_channel(struct lttng_consumer_channel *channel);
 
 /* lttng-relayd consumer command */
@@ -478,6 +500,7 @@ int lttng_consumer_get_produced_snapshot(struct lttng_consumer_stream *stream,
 void *consumer_thread_metadata_poll(void *data);
 void *consumer_thread_data_poll(void *data);
 void *consumer_thread_sessiond_poll(void *data);
+void *consumer_thread_channel_poll(void *data);
 int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		int sock, struct pollfd *consumer_sockpoll);