X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=11c98773ee363de996ff03d6d158695c4f6e67c7;hb=840cb59cfc335e2ca44841f6fd57972ac3a623be;hp=1a1e1c8d8086d4d9155fda1436a955d192d741a8;hpb=ca22feea083301934d1c8511851c86fb008c0697;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index 1a1e1c8d8..11c98773e 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -82,9 +82,6 @@ struct consumer_data {
 	char err_unix_sock_path[PATH_MAX];
 	char cmd_unix_sock_path[PATH_MAX];
 
-	/* Health check of the thread */
-	struct health_state health;
-
 	/* communication lock */
 	pthread_mutex_t lock;
 };
@@ -163,15 +160,18 @@ struct consumer_output *consumer_copy_output(struct consumer_output *obj);
 void consumer_destroy_output(struct consumer_output *obj);
 int consumer_set_network_uri(struct consumer_output *obj,
 		struct lttng_uri *uri);
-int consumer_send_fds(int sock, int *fds, size_t nb_fd);
-int consumer_send_stream(int sock, struct consumer_output *dst,
-		struct lttcomm_consumer_msg *msg, int *fds, size_t nb_fd);
-int consumer_send_channel(int sock, struct lttcomm_consumer_msg *msg);
-int consumer_send_relayd_socket(int consumer_sock,
+int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd);
+int consumer_send_stream(struct consumer_socket *sock,
+		struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
+		int *fds, size_t nb_fd);
+int consumer_send_channel(struct consumer_socket *sock,
+		struct lttcomm_consumer_msg *msg);
+int consumer_send_relayd_socket(struct consumer_socket *consumer_sock,
 		struct lttcomm_sock *sock, struct consumer_output *consumer,
-		enum lttng_stream_type type);
+		enum lttng_stream_type type, unsigned int session_id);
 int consumer_send_destroy_relayd(struct consumer_socket *sock,
 		struct consumer_output *consumer);
+int consumer_recv_status_reply(struct consumer_socket *sock);
 void consumer_output_send_destroy_relayd(struct consumer_output *consumer);
 int consumer_create_socket(struct consumer_data *data,
 		struct consumer_output *output);
@@ -199,5 +199,7 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint64_t mmap_len,
 		const char *name,
 		unsigned int nb_init_streams);
+int consumer_is_data_pending(unsigned int id,
+		struct consumer_output *consumer);
 
 #endif /* _CONSUMER_H */