X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.h;h=dd26e51834d5738a653380b0ab8e872902d565ed;hp=bf87609f3f1aea428128895cdab7ba20cf1f8568;hb=5c786dedd0156b93984f89ba47ec841277ed7dae;hpb=73811eccc9599ebf62e5f5bee49039cecc25c3eb

diff --git a/src/common/consumer.h b/src/common/consumer.h
index bf87609f3..dd26e5183 100644
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -54,6 +54,8 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_CLOSE_METADATA,
 	LTTNG_CONSUMER_SETUP_METADATA,
 	LTTNG_CONSUMER_FLUSH_CHANNEL,
+	LTTNG_CONSUMER_SNAPSHOT_CHANNEL,
+	LTTNG_CONSUMER_SNAPSHOT_METADATA,
 };
 
 /* State of each fd in consumer */
@@ -85,6 +87,8 @@ enum consumer_channel_type {
 	CONSUMER_CHANNEL_TYPE_DATA	= 1,
 };
 
+extern struct lttng_consumer_global_data consumer_data;
+
 struct stream_list {
 	struct cds_list_head head;
 	unsigned int count;
@@ -102,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. */
@@ -109,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.
@@ -130,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
@@ -152,6 +162,12 @@ struct lttng_consumer_channel {
 	/* On-disk circular buffer */
 	uint64_t tracefile_size;
 	uint64_t tracefile_count;
+	/*
+	 * 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;
 };
 
 /*
@@ -200,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 */
@@ -243,6 +267,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;
 };
 
 /*
@@ -250,7 +286,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;
 
@@ -335,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;
@@ -458,21 +494,24 @@ struct lttng_consumer_stream *consumer_allocate_stream(uint64_t channel_key,
 		const char *channel_name,
 		uid_t uid,
 		gid_t gid,
-		int relayd_id,
+		uint64_t relayd_id,
 		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,
 		const char *name,
 		uid_t uid,
 		gid_t gid,
-		int relayd_id,
+		uint64_t relayd_id,
 		enum lttng_event_output output,
 		uint64_t tracefile_size,
-		uint64_t tracefile_count);
+		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);
 void consumer_del_metadata_stream(struct lttng_consumer_stream *stream,
@@ -483,8 +522,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);
@@ -496,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,
@@ -519,10 +560,10 @@ 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);
+		uint64_t sessiond_id);
 void consumer_flag_relayd_for_destroy(
 		struct consumer_relayd_sock_pair *relayd);
 int consumer_data_pending(uint64_t id);
@@ -531,5 +572,8 @@ int consumer_send_status_channel(int sock,
 		struct lttng_consumer_channel *channel);
 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 */