X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.h;h=1b0ee000b5bdd944ac4aba946a83d256327a5195;hp=aa8a401a0416efe089057f2e07b6187c38bf78d5;hb=4bd69c5f1161cd065f487da0f4c1aa03a73c47e4;hpb=6f9449c22eef59294cf1e1dc3610a5cbf14baec0

diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h
index aa8a401a0..1b0ee000b 100644
--- a/src/common/consumer/consumer.h
+++ b/src/common/consumer/consumer.h
@@ -27,6 +27,11 @@
 #include <common/trace-chunk-registry.h>
 #include <common/credentials.h>
 #include <common/buffer-view.h>
+#include <common/dynamic-array.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 struct lttng_consumer_local_data;
 
@@ -64,6 +69,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,7 +94,13 @@ enum consumer_channel_type {
 	CONSUMER_CHANNEL_TYPE_DATA	= 1,
 };
 
-extern struct lttng_consumer_global_data consumer_data;
+enum sync_metadata_status {
+	SYNC_METADATA_STATUS_NEW_DATA,
+	SYNC_METADATA_STATUS_NO_DATA,
+	SYNC_METADATA_STATUS_ERROR,
+};
+
+extern struct lttng_consumer_global_data the_consumer_data;
 
 struct stream_list {
 	struct cds_list_head head;
@@ -152,7 +164,7 @@ struct lttng_consumer_channel {
 
 	/* For UST */
 	uid_t ust_app_uid;	/* Application UID. */
-	struct ustctl_consumer_channel *uchan;
+	struct lttng_ust_ctl_consumer_channel *uchan;
 	unsigned char uuid[LTTNG_UUID_STR_LEN];
 	/*
 	 * Temporary stream list used to store the streams once created and waiting
@@ -265,6 +277,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;
@@ -283,6 +303,12 @@ struct stream_subbuffer {
 	} info;
 };
 
+enum get_next_subbuffer_status {
+	GET_NEXT_SUBBUFFER_STATUS_OK,
+	GET_NEXT_SUBBUFFER_STATUS_NO_DATA,
+	GET_NEXT_SUBBUFFER_STATUS_ERROR,
+};
+
 /*
  * Perform any operation required to acknowledge
  * the wake-up of a consumer stream (e.g. consume a byte on a wake-up pipe).
@@ -305,8 +331,8 @@ typedef int (*on_sleep_cb)(struct lttng_consumer_stream *,
  *
  * Stream and channel locks are acquired during this call.
  */
-typedef int (*get_next_subbuffer_cb)(struct lttng_consumer_stream *,
-		struct stream_subbuffer *);
+typedef enum get_next_subbuffer_status (*get_next_subbuffer_cb)(
+		struct lttng_consumer_stream *, struct stream_subbuffer *);
 
 /*
  * Populate the stream_subbuffer's info member. The info to populate
@@ -524,7 +550,7 @@ struct lttng_consumer_stream {
 	/* Stream name. Format is: <channel_name>_<cpu_number> */
 	char name[LTTNG_SYMBOL_NAME_LEN];
 	/* Internal state of libustctl. */
-	struct ustctl_consumer_stream *ustream;
+	struct lttng_ust_ctl_consumer_stream *ustream;
 	struct cds_list_head send_node;
 	/* On-disk circular buffer */
 	uint64_t tracefile_size_current;
@@ -582,6 +608,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
@@ -618,11 +647,12 @@ struct lttng_consumer_stream {
 		reset_metadata_cb reset_metadata;
 		consume_subbuffer_cb consume_subbuffer;
 		put_next_subbuffer_cb put_next_subbuffer;
-		post_consume_cb post_consume;
+		struct lttng_dynamic_array post_consume_cbs;
 		send_live_beacon_cb send_live_beacon;
 		on_sleep_cb on_sleep;
 		unlock_cb unlock;
 	} read_subbuffer_ops;
+	struct metadata_bucket *metadata_bucket;
 };
 
 /*
@@ -829,8 +859,12 @@ extern int consumer_quit;
  */
 extern int consumer_quit;
 
-/* Flag used to temporarily pause data consumption from testpoints. */
-extern int data_consumption_paused;
+/*
+ * Flag used to temporarily pause data consumption from testpoints.
+ *
+ * This variable is dlsym-ed from a test, so needs to be exported.
+ */
+LTTNG_EXPORT extern int data_consumption_paused;
 
 /* Return a human-readable consumer type string that is suitable for logging. */
 static inline
@@ -954,7 +988,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 +1064,13 @@ 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);
+void lttng_consumer_sigbus_handle(void *addr);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* LIB_CONSUMER_H */