X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=d0986ef1e3203a420f2054b75da65ab94cdfcd77;hb=6dc3064a30b0cc7cfa9fdd22da1963525dfb7388;hp=43989e4c55757d760cad1b4fdf93ca29b739453c;hpb=a0cbdd2ea782afd7c263ff748dcca597095b61a0;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 43989e4c5..d0986ef1e 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -31,6 +31,7 @@
 #include <common/compat/fcntl.h>
 #include <common/compat/uuid.h>
 #include <common/sessiond-comm/sessiond-comm.h>
+#include <common/pipe.h>
 
 /* Commands for consumer */
 enum lttng_consumer_command {
@@ -53,6 +54,8 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_CLOSE_METADATA,
 	LTTNG_CONSUMER_SETUP_METADATA,
 	LTTNG_CONSUMER_FLUSH_CHANNEL,
+	LTTNG_CONSUMER_SNAPSHOT_CHANNEL,
+	LTTNG_CONSUMER_SNAPSHOT_METADATA,
 };
 
 /* State of each fd in consumer */
@@ -84,6 +87,8 @@ enum consumer_channel_type {
 	CONSUMER_CHANNEL_TYPE_DATA	= 1,
 };
 
+extern struct lttng_consumer_global_data consumer_data;
+
 struct stream_list {
 	struct cds_list_head head;
 	unsigned int count;
@@ -221,6 +226,7 @@ struct lttng_consumer_stream {
 	 * Lock to use the stream FDs since they are used between threads.
 	 *
 	 * This is nested INSIDE the consumer_data lock.
+	 * This is nested INSIDE the metadata cache lock.
 	 * This is nested OUTSIDE consumer_relayd_sock_pair lock.
 	 */
 	pthread_mutex_t lock;
@@ -346,11 +352,11 @@ struct lttng_consumer_local_data {
 	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];
+	struct lttng_pipe *consumer_data_pipe;
 	/* 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 */
-	int consumer_metadata_pipe[2];
+	struct lttng_pipe *consumer_metadata_pipe;
 };
 
 /*
@@ -456,7 +462,7 @@ struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
 		const char *channel_name,
 		uid_t uid,
 		gid_t gid,
-		int relayd_id,
+		uint64_t relayd_id,
 		uint64_t session_id,
 		int cpu,
 		int *alloc_ret,
@@ -467,7 +473,7 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		const char *name,
 		uid_t uid,
 		gid_t gid,
-		int relayd_id,
+		uint64_t relayd_id,
 		enum lttng_event_output output,
 		uint64_t tracefile_size,
 		uint64_t tracefile_count);
@@ -529,5 +535,6 @@ int consumer_send_status_channel(int sock,
 		struct lttng_consumer_channel *channel);
 void notify_thread_del_channel(struct lttng_consumer_local_data *ctx,
 		uint64_t key);
+void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd);
 
 #endif /* LIB_CONSUMER_H */