X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=3a0c6c8d8f5e3a737e9ce6da64c3fb4e09c4dd21;hp=a64bcad3bba01975a97609793379baab651dee97;hb=a9838785aecf564595c531772f7ca906b658afa0;hpb=4891ece8d4eeb2645efdf1467680b037c63ab425

diff --git a/src/common/consumer.h b/src/common/consumer.h
index a64bcad3b..3a0c6c8d8 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -168,6 +168,16 @@ struct lttng_consumer_channel {
 	 * monitor list of the channel.
 	 */
 	unsigned int monitor;
+
+	/*
+	 * Channel lock.
+	 *
+	 * This is nested INSIDE the consumer data lock.
+	 * This is nested OUTSIDE the metadata cache lock.
+	 * This is nested OUTSIDE stream lock.
+	 * This is nested OUTSIDE consumer_relayd_sock_pair lock.
+	 */
+	pthread_mutex_t lock;
 };
 
 /*
@@ -216,6 +226,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 */
@@ -239,6 +257,7 @@ struct lttng_consumer_stream {
 	 *
 	 * This is nested INSIDE the consumer_data lock.
 	 * This is nested INSIDE the metadata cache lock.
+	 * This is nested INSIDE the channel lock.
 	 * This is nested OUTSIDE consumer_relayd_sock_pair lock.
 	 */
 	pthread_mutex_t lock;
@@ -363,7 +382,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;
@@ -529,7 +548,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,
@@ -555,7 +574,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);
@@ -565,5 +584,7 @@ int consumer_send_status_channel(int sock,
 void notify_thread_del_channel(struct lttng_consumer_local_data *ctx,
 		uint64_t key);
 void consumer_destroy_relayd(struct consumer_relayd_sock_pair *relayd);
+unsigned long consumer_get_consumed_maxsize(unsigned long consumed_pos,
+		unsigned long produced_pos, uint64_t max_stream_size);
 
 #endif /* LIB_CONSUMER_H */