X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=7ff3e5dcf70cbe06f28c371480ffd4391eec75a1;hb=4ce514c43483ba24fd935024da5b7aca681a7e52;hp=09f4545a03fdc1e40fb777aaff1c4f9cdf278b2d;hpb=6151a90fe7fa3dea52c57771df9083e56de7a60b;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index 09f4545a0..7ff3e5dcf 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -22,14 +22,23 @@
 #include <common/hashtable/hashtable.h>
 #include <lttng/lttng.h>
 
+#include "snapshot.h"
+
+struct snapshot;
+struct snapshot_output;
+
 enum consumer_dst_type {
 	CONSUMER_DST_LOCAL,
 	CONSUMER_DST_NET,
 };
 
 struct consumer_socket {
-	/* File descriptor */
-	int fd;
+	/*
+	 * File descriptor. This is just a reference to the consumer data meaning
+	 * that every access must be locked and check for a possible invalid value.
+	 */
+	int *fd;
+
 	/*
 	 * To use this socket (send/recv), this lock MUST be acquired.
 	 */
@@ -48,6 +57,8 @@ struct consumer_socket {
 	unsigned int data_sock_sent;
 
 	struct lttng_ht_node_ulong node;
+
+	enum lttng_consumer_type type;
 };
 
 struct consumer_data {
@@ -80,6 +91,13 @@ struct consumer_data {
 	int err_sock;
 	/* These two sockets uses the cmd_unix_sock_path. */
 	int cmd_sock;
+	/*
+	 * The metadata socket object is handled differently and only created
+	 * locally in this object thus it's the only reference available in the
+	 * session daemon. For that reason, a static variable for the fd is
+	 * required and the metadata socket fd points to it.
+	 */
+	int metadata_fd;
 	struct consumer_socket metadata_sock;
 
 	/* consumer error and command Unix socket path */
@@ -150,12 +168,15 @@ struct consumer_socket *consumer_find_socket(int key,
 		struct consumer_output *consumer);
 struct consumer_socket *consumer_find_socket_by_bitness(int bits,
 		struct consumer_output *consumer);
-struct consumer_socket *consumer_allocate_socket(int fd);
+struct consumer_socket *consumer_allocate_socket(int *fd);
 void consumer_add_socket(struct consumer_socket *sock,
 		struct consumer_output *consumer);
 void consumer_del_socket(struct consumer_socket *sock,
 		struct consumer_output *consumer);
 void consumer_destroy_socket(struct consumer_socket *sock);
+int consumer_copy_sockets(struct consumer_output *dst,
+		struct consumer_output *src);
+void consumer_destroy_output_sockets(struct consumer_output *obj);
 
 struct consumer_output *consumer_create_output(enum consumer_dst_type type);
 struct consumer_output *consumer_copy_output(struct consumer_output *obj);
@@ -202,7 +223,10 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		unsigned char *uuid,
 		uint32_t chan_id,
 		uint64_t tracefile_size,
-		uint64_t tracefile_count);
+		uint64_t tracefile_count,
+		uint64_t session_id_per_pid,
+		unsigned int monitor,
+		uint32_t ust_app_uid);
 void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 		enum lttng_consumer_command cmd,
 		uint64_t channel_key,
@@ -221,7 +245,8 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		enum lttng_event_output output,
 		int type,
 		uint64_t tracefile_size,
-		uint64_t tracefile_count);
+		uint64_t tracefile_count,
+		unsigned int monitor);
 int consumer_is_data_pending(uint64_t session_id,
 		struct consumer_output *consumer);
 int consumer_close_metadata(struct consumer_socket *socket,
@@ -233,4 +258,9 @@ int consumer_push_metadata(struct consumer_socket *socket,
 		size_t target_offset);
 int consumer_flush_channel(struct consumer_socket *socket, uint64_t key);
 
+/* Snapshot command. */
+int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
+		struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
+		const char *session_path, int wait, int max_size_per_stream);
+
 #endif /* _CONSUMER_H */