X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.h;h=09f4545a03fdc1e40fb777aaff1c4f9cdf278b2d;hp=af337baa386b61f81e587609a03d3e7ae800d1a2;hb=36b588eddce05ef840bd247f6a58316925b9a0a2;hpb=ffe600149a7608221985751e1bf293234bf2545c

diff --git a/src/bin/lttng-sessiond/consumer.h b/src/bin/lttng-sessiond/consumer.h
index af337baa3..09f4545a0 100644
--- a/src/bin/lttng-sessiond/consumer.h
+++ b/src/bin/lttng-sessiond/consumer.h
@@ -22,8 +22,6 @@
 #include <common/hashtable/hashtable.h>
 #include <lttng/lttng.h>
 
-#include "health.h"
-
 enum consumer_dst_type {
 	CONSUMER_DST_LOCAL,
 	CONSUMER_DST_NET,
@@ -80,7 +78,9 @@ struct consumer_data {
 	pid_t pid;
 
 	int err_sock;
+	/* These two sockets uses the cmd_unix_sock_path. */
 	int cmd_sock;
+	struct consumer_socket metadata_sock;
 
 	/* consumer error and command Unix socket path */
 	char err_unix_sock_path[PATH_MAX];
@@ -126,7 +126,7 @@ struct consumer_output {
 	 * side. It tells the consumer which streams goes to which relayd with this
 	 * index. The relayd sockets are index with it on the consumer side.
 	 */
-	int net_seq_index;
+	uint64_t net_seq_index;
 
 	/*
 	 * Subdirectory path name used for both local and network consumer.
@@ -148,6 +148,8 @@ struct consumer_output {
 
 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);
 void consumer_add_socket(struct consumer_socket *sock,
 		struct consumer_output *consumer);
@@ -169,13 +171,13 @@ int consumer_send_stream(struct consumer_socket *sock,
 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, unsigned int session_id);
+		struct lttcomm_relayd_sock *rsock, struct consumer_output *consumer,
+		enum lttng_stream_type type, uint64_t session_id);
 int consumer_send_destroy_relayd(struct consumer_socket *sock,
 		struct consumer_output *consumer);
 int consumer_recv_status_reply(struct consumer_socket *sock);
 int consumer_recv_status_channel(struct consumer_socket *sock,
-		unsigned long *key, unsigned int *stream_count);
+		uint64_t *key, unsigned int *stream_count);
 void consumer_output_send_destroy_relayd(struct consumer_output *consumer);
 int consumer_create_socket(struct consumer_data *data,
 		struct consumer_output *output);
@@ -195,27 +197,40 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		const char *name,
 		uid_t uid,
 		gid_t gid,
-		int relayd_id,
-		unsigned long key,
-		unsigned char *uuid);
+		uint64_t relayd_id,
+		uint64_t key,
+		unsigned char *uuid,
+		uint32_t chan_id,
+		uint64_t tracefile_size,
+		uint64_t tracefile_count);
 void consumer_init_stream_comm_msg(struct lttcomm_consumer_msg *msg,
 		enum lttng_consumer_command cmd,
-		int channel_key,
-		int stream_key,
+		uint64_t channel_key,
+		uint64_t stream_key,
 		int cpu);
 void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		enum lttng_consumer_command cmd,
-		int channel_key,
+		uint64_t channel_key,
 		uint64_t session_id,
 		const char *pathname,
 		uid_t uid,
 		gid_t gid,
-		int relayd_id,
+		uint64_t relayd_id,
 		const char *name,
 		unsigned int nb_init_streams,
 		enum lttng_event_output output,
-		int type);
-int consumer_is_data_pending(unsigned int id,
+		int type,
+		uint64_t tracefile_size,
+		uint64_t tracefile_count);
+int consumer_is_data_pending(uint64_t session_id,
 		struct consumer_output *consumer);
+int consumer_close_metadata(struct consumer_socket *socket,
+		uint64_t metadata_key);
+int consumer_setup_metadata(struct consumer_socket *socket,
+		uint64_t metadata_key);
+int consumer_push_metadata(struct consumer_socket *socket,
+		uint64_t metadata_key, char *metadata_str, size_t len,
+		size_t target_offset);
+int consumer_flush_channel(struct consumer_socket *socket, uint64_t key);
 
 #endif /* _CONSUMER_H */