X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=91f6b5ca15a6ddbdcbc8f28e641f824e34a4c64d;hb=e5d1a9b33aa0920bbd9f6948bd0676156da67c61;hp=fe396c017a6f4109291d95aa64d50a462c7a3dcb;hpb=feb78e88e113ec8c6918253e93136b5f6235ad31;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index fe396c017..91f6b5ca1 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -115,7 +115,7 @@ struct lttng_consumer_channel {
 	char pathname[PATH_MAX];
 	/* Channel name. */
 	char name[LTTNG_SYMBOL_NAME_LEN];
-	/* UID and GID of the channel. */
+	/* UID and GID of the session owning this channel. */
 	uid_t uid;
 	gid_t gid;
 	/* Relayd id of the channel. -1ULL if it does not apply. */
@@ -131,6 +131,7 @@ struct lttng_consumer_channel {
 	enum consumer_channel_type type;
 
 	/* For UST */
+	uid_t ust_app_uid;	/* Application UID. */
 	struct ustctl_consumer_channel *uchan;
 	unsigned char uuid[UUID_STR_LEN];
 	/*
@@ -172,12 +173,29 @@ struct lttng_consumer_channel {
 	/*
 	 * Channel lock.
 	 *
+	 * This lock protects against concurrent update of channel.
+	 *
 	 * This is nested INSIDE the consumer data lock.
+	 * This is nested OUTSIDE the channel timer 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;
+
+	/*
+	 * Channel teardown lock.
+	 *
+	 * This lock protect against teardown of channel. It is _never_
+	 * taken by the timer handler.
+	 *
+	 * This is nested INSIDE the consumer data lock.
+	 * This is nested INSIDE the channel 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 timer_lock;
 };
 
 /*
@@ -203,6 +221,8 @@ struct lttng_consumer_stream {
 	int out_fd; /* output file to write the data */
 	/* Write position in the output file descriptor */
 	off_t out_fd_offset;
+	/* Amount of bytes written to the output */
+	uint64_t output_written;
 	enum lttng_consumer_stream_state state;
 	int shm_fd_is_copy;
 	int data_read;
@@ -258,6 +278,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 INSIDE the channel timer lock.
 	 * This is nested OUTSIDE consumer_relayd_sock_pair lock.
 	 */
 	pthread_mutex_t lock;
@@ -396,8 +417,14 @@ struct lttng_consumer_local_data {
 	enum lttng_consumer_type type;
 	/* socket to communicate errors with sessiond */
 	int consumer_error_socket;
-	/* socket to ask metadata to sessiond */
+	/* socket to ask metadata to sessiond. */
 	int consumer_metadata_socket;
+	/*
+	 * Protect consumer_metadata_socket.
+	 *
+	 * This is nested OUTSIDE the metadata cache lock.
+	 */
+	pthread_mutex_t metadata_socket_lock;
 	/* socket to exchange commands with sessiond */
 	char *consumer_command_sock_path;
 	/* communication with splice */
@@ -596,5 +623,9 @@ void notify_thread_del_channel(struct lttng_consumer_local_data *ctx,
 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);
+int consumer_add_data_stream(struct lttng_consumer_stream *stream);
+void consumer_del_stream_for_data(struct lttng_consumer_stream *stream);
+int consumer_add_metadata_stream(struct lttng_consumer_stream *stream);
+void consumer_del_stream_for_metadata(struct lttng_consumer_stream *stream);
 
 #endif /* LIB_CONSUMER_H */