X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=eeaf1100243e1f232a1acb47e0aacdeb4487293c;hb=30319bcbeabf573068172289850aea0bcfe23abc;hp=fa503ea111836c18335eb7863123275daa2a6edc;hpb=da009f2c0baef56316db8087abd1867f99969374;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index fa503ea11..eeaf11002 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -140,12 +140,6 @@ struct lttng_consumer_channel {
 	 */
 	struct stream_list streams;
 
-	/*
-	 * List of streams in no monitor mode for this channel. Used ONLY for
-	 * snapshots recording.
-	 */
-	struct stream_list stream_no_monitor_list;
-
 	/*
 	 * Set if the channel is metadata. We keep a reference to the stream
 	 * because we have to flush data once pushed by the session daemon. For a
@@ -222,6 +216,14 @@ struct lttng_consumer_stream {
 	gid_t gid;
 	/* Network sequence number. Indicating on which relayd socket it goes. */
 	uint64_t net_seq_idx;
+	/*
+	 * Indicate if this stream was successfully sent to a relayd. This is set
+	 * after the refcount of the relayd is incremented and is checked when the
+	 * stream is closed before decrementing the refcount in order to avoid an
+	 * unbalanced state.
+	 */
+	unsigned int sent_to_relayd;
+
 	/* Identify if the stream is the metadata */
 	unsigned int metadata_flag;
 	/* Used when the stream is set for network streaming */
@@ -265,9 +267,18 @@ struct lttng_consumer_stream {
 	/* On-disk circular buffer */
 	uint64_t tracefile_size_current;
 	uint64_t tracefile_count_current;
-
-	/* Node for the no monitor stream list in a channel. */
-	struct cds_list_head no_monitor_node;
+	/*
+	 * Monitor or not the streams of this channel meaning this indicates if the
+	 * streams should be sent to the data/metadata thread or added to the no
+	 * monitor list of the channel.
+	 */
+	unsigned int monitor;
+	/*
+	 * Indicate if the stream is globally visible meaning that it has been
+	 * added to the multiple hash tables. If *not* set, NO lock should be
+	 * acquired in the destroy path.
+	 */
+	unsigned int globally_visible;
 };
 
 /*
@@ -360,7 +371,7 @@ struct lttng_consumer_local_data {
 	 *   == 0 (success, FD is left to library)
 	 *    < 0 (error)
 	 */
-	int (*on_update_stream)(int sessiond_key, uint32_t state);
+	int (*on_update_stream)(uint64_t sessiond_key, uint32_t state);
 	enum lttng_consumer_type type;
 	/* socket to communicate errors with sessiond */
 	int consumer_error_socket;
@@ -487,7 +498,8 @@ struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
 		uint64_t session_id,
 		int cpu,
 		int *alloc_ret,
-		enum consumer_channel_type type);
+		enum consumer_channel_type type,
+		unsigned int monitor);
 struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		uint64_t session_id,
 		const char *pathname,
@@ -512,6 +524,8 @@ void consumer_del_channel(struct lttng_consumer_channel *channel);
 struct consumer_relayd_sock_pair *consumer_allocate_relayd_sock_pair(
 		uint64_t net_seq_idx);
 struct consumer_relayd_sock_pair *consumer_find_relayd(uint64_t key);
+int consumer_send_relayd_stream(struct lttng_consumer_stream *stream, char *path);
+void close_relayd_stream(struct lttng_consumer_stream *stream);
 struct lttng_consumer_channel *consumer_find_channel(uint64_t key);
 int consumer_handle_stream_before_relayd(struct lttng_consumer_stream *stream,
 		size_t data_size);
@@ -523,7 +537,7 @@ struct lttng_consumer_local_data *lttng_consumer_create(
 			struct lttng_consumer_local_data *ctx),
 		int (*recv_channel)(struct lttng_consumer_channel *channel),
 		int (*recv_stream)(struct lttng_consumer_stream *stream),
-		int (*update_stream)(int sessiond_key, uint32_t state));
+		int (*update_stream)(uint64_t sessiond_key, uint32_t state));
 void lttng_consumer_destroy(struct lttng_consumer_local_data *ctx);
 ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		struct lttng_consumer_local_data *ctx,
@@ -549,7 +563,7 @@ int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);
 int consumer_add_relayd_socket(uint64_t net_seq_idx, int sock_type,
 		struct lttng_consumer_local_data *ctx, int sock,
 		struct pollfd *consumer_sockpoll, struct lttcomm_relayd_sock *relayd_sock,
-		unsigned int sessiond_id);
+		uint64_t sessiond_id);
 void consumer_flag_relayd_for_destroy(
 		struct consumer_relayd_sock_pair *relayd);
 int consumer_data_pending(uint64_t id);