X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcommon%2Fconsumer.h;h=a64bcad3bba01975a97609793379baab651dee97;hb=4891ece8d4eeb2645efdf1467680b037c63ab425;hp=9fadc5a06e9cc21743854829c57832550a11f958;hpb=2bba9e532ca1910822005ff7f67400a2e871467c;p=lttng-tools.git

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 9fadc5a06..a64bcad3b 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -106,6 +106,11 @@ struct lttng_consumer_channel {
 	int refcount;
 	/* Tracing session id on the session daemon side. */
 	uint64_t session_id;
+	/*
+	 * Session id when requesting metadata to the session daemon for
+	 * a session with per-PID buffers.
+	 */
+	uint64_t session_id_per_pid;
 	/* Channel trace file path name. */
 	char pathname[PATH_MAX];
 	/* Channel name. */
@@ -113,8 +118,8 @@ struct lttng_consumer_channel {
 	/* UID and GID of the channel. */
 	uid_t uid;
 	gid_t gid;
-	/* Relayd id of the channel. -1 if it does not apply. */
-	int64_t relayd_id;
+	/* Relayd id of the channel. -1ULL if it does not apply. */
+	uint64_t relayd_id;
 	/*
 	 * Number of streams NOT initialized yet. This is used in order to not
 	 * delete this channel if streams are getting initialized.
@@ -134,6 +139,7 @@ struct lttng_consumer_channel {
 	 * LTTNG_CONSUMER_GET_CHANNEL.
 	 */
 	struct stream_list streams;
+
 	/*
 	 * 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
@@ -253,6 +259,18 @@ struct lttng_consumer_stream {
 	/* On-disk circular buffer */
 	uint64_t tracefile_size_current;
 	uint64_t tracefile_count_current;
+	/*
+	 * 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;
 };
 
 /*
@@ -260,7 +278,7 @@ struct lttng_consumer_stream {
  */
 struct consumer_relayd_sock_pair {
 	/* Network sequence number. */
-	int64_t net_seq_idx;
+	uint64_t net_seq_idx;
 	/* Number of stream associated with this relayd */
 	unsigned int refcount;
 
@@ -472,7 +490,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,
@@ -483,6 +502,7 @@ struct lttng_consumer_channel *consumer_allocate_channel(uint64_t key,
 		enum lttng_event_output output,
 		uint64_t tracefile_size,
 		uint64_t tracefile_count,
+		uint64_t session_id_per_pid,
 		unsigned int monitor);
 void consumer_del_stream(struct lttng_consumer_stream *stream,
 		struct lttng_ht *ht);
@@ -494,8 +514,10 @@ void consumer_del_channel(struct lttng_consumer_channel *channel);
 
 /* lttng-relayd consumer command */
 struct consumer_relayd_sock_pair *consumer_allocate_relayd_sock_pair(
-		int net_seq_idx);
+		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);
@@ -530,7 +552,7 @@ int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 		struct lttng_consumer_local_data *ctx);
 int lttng_consumer_on_recv_stream(struct lttng_consumer_stream *stream);
-int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
+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);