X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fconsumer.h;h=9a93c427915bbd6de3aef1bdbc9440320244092a;hb=c80048c6378b9ee7796c4b833a2c07f6050cc6d7;hp=fc5d5ef14dfdf02a1dbb62f63b46c76fa22c1150;hpb=a6ba4fe1a8217fd5cb9e286b4d88a9252c0d5d06;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index fc5d5ef14..9a93c4279 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -77,13 +77,18 @@ struct lttng_consumer_channel {
 	int key;
 	uint64_t max_sb_size; /* the subbuffer size for this channel */
 	int refcount; /* Number of streams referencing this channel */
+	/*
+	 * The number of streams to receive initially. Used to guarantee that we do
+	 * not destroy a channel before receiving all its associated streams.
+	 */
+	unsigned int nb_init_streams;
+
 	/* For UST */
 	int shm_fd;
 	int wait_fd;
 	void *mmap_base;
 	size_t mmap_len;
 	struct lttng_ust_shm_handle *handle;
-	int nr_streams;
 	int wait_fd_is_copy;
 	int cpucount;
 };
@@ -224,10 +229,13 @@ struct lttng_consumer_local_data {
 	char *consumer_command_sock_path;
 	/* communication with splice */
 	int consumer_thread_pipe[2];
+	int consumer_splice_metadata_pipe[2];
 	/* pipe to wake the poll thread when necessary */
 	int consumer_poll_pipe[2];
 	/* 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];
 };
 
 /*
@@ -318,8 +326,7 @@ extern int lttng_consumer_poll_socket(struct pollfd *kconsumer_sockpoll);
 
 extern int consumer_update_poll_array(
 		struct lttng_consumer_local_data *ctx, struct pollfd **pollfd,
-		struct lttng_consumer_stream **local_consumer_streams,
-		struct lttng_ht *metadata_ht);
+		struct lttng_consumer_stream **local_consumer_streams);
 
 extern struct lttng_consumer_stream *consumer_allocate_stream(
 		int channel_key, int stream_key,
@@ -331,7 +338,8 @@ extern struct lttng_consumer_stream *consumer_allocate_stream(
 		uid_t uid,
 		gid_t gid,
 		int net_index,
-		int metadata_flag);
+		int metadata_flag,
+		int *alloc_ret);
 extern int consumer_add_stream(struct lttng_consumer_stream *stream);
 extern void consumer_del_stream(struct lttng_consumer_stream *stream);
 extern void consumer_change_stream_state(int stream_key,
@@ -341,17 +349,16 @@ extern struct lttng_consumer_channel *consumer_allocate_channel(
 		int channel_key,
 		int shm_fd, int wait_fd,
 		uint64_t mmap_len,
-		uint64_t max_sb_size);
+		uint64_t max_sb_size,
+		unsigned int nb_init_streams);
 int consumer_add_channel(struct lttng_consumer_channel *channel);
 
 /* lttng-relayd consumer command */
-int consumer_add_relayd(struct consumer_relayd_sock_pair *relayd);
 struct consumer_relayd_sock_pair *consumer_allocate_relayd_sock_pair(
 		int net_seq_idx);
 struct consumer_relayd_sock_pair *consumer_find_relayd(int key);
 int consumer_handle_stream_before_relayd(struct lttng_consumer_stream *stream,
 		size_t data_size);
-void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd);
 
 extern struct lttng_consumer_local_data *lttng_consumer_create(
 		enum lttng_consumer_type type,
@@ -363,10 +370,12 @@ extern struct lttng_consumer_local_data *lttng_consumer_create(
 extern void lttng_consumer_destroy(struct lttng_consumer_local_data *ctx);
 extern ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		struct lttng_consumer_local_data *ctx,
-		struct lttng_consumer_stream *stream, unsigned long len);
+		struct lttng_consumer_stream *stream, unsigned long len,
+		unsigned long padding);
 extern ssize_t lttng_consumer_on_read_subbuffer_splice(
 		struct lttng_consumer_local_data *ctx,
-		struct lttng_consumer_stream *stream, unsigned long len);
+		struct lttng_consumer_stream *stream, unsigned long len,
+		unsigned long padding);
 extern int lttng_consumer_take_snapshot(struct lttng_consumer_local_data *ctx,
 		struct lttng_consumer_stream *stream);
 extern int lttng_consumer_get_produced_snapshot(