X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=e927d19364b44ac6dfdb554d91b9a9ee18ca040f;hb=8aaed9e719995e6fdc4d87decd1252594d3d80e7;hp=aa8a401a0416efe089057f2e07b6187c38bf78d5;hpb=bdc8d1bb2ea3784a2aba877288859567171b1f35;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index aa8a401a0..e927d1936 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -64,6 +64,7 @@ enum lttng_consumer_command {
 	LTTNG_CONSUMER_CLOSE_TRACE_CHUNK,
 	LTTNG_CONSUMER_TRACE_CHUNK_EXISTS,
 	LTTNG_CONSUMER_CLEAR_CHANNEL,
+	LTTNG_CONSUMER_OPEN_CHANNEL_PACKETS,
 };
 
 enum lttng_consumer_type {
@@ -88,6 +89,12 @@ enum consumer_channel_type {
 	CONSUMER_CHANNEL_TYPE_DATA	= 1,
 };
 
+enum sync_metadata_status {
+	SYNC_METADATA_STATUS_NEW_DATA,
+	SYNC_METADATA_STATUS_NO_DATA,
+	SYNC_METADATA_STATUS_ERROR,
+};
+
 extern struct lttng_consumer_global_data consumer_data;
 
 struct stream_list {
@@ -265,6 +272,14 @@ struct stream_subbuffer {
 			unsigned long subbuf_size;
 			unsigned long padded_subbuf_size;
 			uint64_t version;
+			/*
+			 * Left unset when unsupported.
+			 *
+			 * Indicates that this is the last sub-buffer of
+			 * a series of sub-buffer that makes-up a coherent
+			 * (parseable) unit of metadata.
+			 */
+			LTTNG_OPTIONAL(bool) coherent;
 		} metadata;
 		struct {
 			unsigned long subbuf_size;
@@ -374,6 +389,13 @@ typedef void (*lock_cb)(struct lttng_consumer_stream *);
  */
 typedef void (*unlock_cb)(struct lttng_consumer_stream *);
 
+/*
+ * Assert that the stream and channel lock and any other stream type specific
+ * lock that need to be acquired during the processing of a read_subbuffer
+ * operation is acquired.
+ */
+typedef void (*assert_locked_cb)(struct lttng_consumer_stream *);
+
 /*
  * Invoked when a subbuffer's metadata version does not match the last
  * known metadata version.
@@ -582,6 +604,9 @@ struct lttng_consumer_stream {
 	 */
 	uint64_t rotate_position;
 
+	/* Whether or not a packet was opened during the current trace chunk. */
+	bool opened_packet_in_current_trace_chunk;
+
 	/*
 	 * Read-only copies of channel values. We cannot safely access the
 	 * channel from a stream, so we need to have a local copy of these
@@ -622,7 +647,9 @@ struct lttng_consumer_stream {
 		send_live_beacon_cb send_live_beacon;
 		on_sleep_cb on_sleep;
 		unlock_cb unlock;
+		assert_locked_cb assert_locked;
 	} read_subbuffer_ops;
+	struct metadata_bucket *metadata_bucket;
 };
 
 /*
@@ -954,7 +981,6 @@ struct lttng_consumer_local_data *lttng_consumer_create(
 		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,
 		struct lttng_consumer_stream *stream,
 		const struct lttng_buffer_view *buffer,
 		unsigned long padding);
@@ -1031,5 +1057,8 @@ enum lttcomm_return_code lttng_consumer_init_command(
 		struct lttng_consumer_local_data *ctx,
 		const lttng_uuid sessiond_uuid);
 int lttng_consumer_clear_channel(struct lttng_consumer_channel *channel);
+enum lttcomm_return_code lttng_consumer_open_channel_packets(
+		struct lttng_consumer_channel *channel);
+int consumer_metadata_wakeup_pipe(const struct lttng_consumer_channel *channel);
 
 #endif /* LIB_CONSUMER_H */