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

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index 7ff3e5dcf..5b4372221 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -35,9 +35,10 @@ enum consumer_dst_type {
 struct consumer_socket {
 	/*
 	 * 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.
+	 * that every access must be locked and checked for a possible invalid
+	 * value.
 	 */
-	int *fd;
+	int *fd_ptr;
 
 	/*
 	 * To use this socket (send/recv), this lock MUST be acquired.
@@ -94,8 +95,8 @@ struct consumer_data {
 	/*
 	 * 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.
+	 * session daemon. For that reason, a variable for the fd is required and
+	 * the metadata socket fd points to it.
 	 */
 	int metadata_fd;
 	struct consumer_socket metadata_sock;
@@ -104,7 +105,11 @@ struct consumer_data {
 	char err_unix_sock_path[PATH_MAX];
 	char cmd_unix_sock_path[PATH_MAX];
 
-	/* communication lock */
+	/*
+	 * This lock has two purposes. It protects any change to the consumer
+	 * socket and make sure only one thread uses this object for read/write
+	 * operations.
+	 */
 	pthread_mutex_t lock;
 };
 
@@ -177,6 +182,10 @@ 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);
+int consumer_socket_send(struct consumer_socket *socket, void *msg,
+		size_t len);
+int consumer_socket_recv(struct consumer_socket *socket, void *msg,
+		size_t len);
 
 struct consumer_output *consumer_create_output(enum consumer_dst_type type);
 struct consumer_output *consumer_copy_output(struct consumer_output *obj);
@@ -211,6 +220,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		int overwrite,
 		unsigned int switch_timer_interval,
 		unsigned int read_timer_interval,
+		unsigned int live_timer_interval,
 		int output,
 		int type,
 		uint64_t session_id,
@@ -246,7 +256,8 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		int type,
 		uint64_t tracefile_size,
 		uint64_t tracefile_count,
-		unsigned int monitor);
+		unsigned int monitor,
+		unsigned int live_timer_interval);
 int consumer_is_data_pending(uint64_t session_id,
 		struct consumer_output *consumer);
 int consumer_close_metadata(struct consumer_socket *socket,