X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng%2Flttng-consumer.h;h=e5672d7b78ef81f45d7ea8134bb288f78253f8dc;hp=7ca94cc1da5818a5c25c00d37298a97cc7ec8a2e;hb=e4baff1ed855ca743e95068ca6449fd906d2d833;hpb=3bd1e0819b577ffcb44acd7c2f8e02ff09654b7b

diff --git a/include/lttng/lttng-consumer.h b/include/lttng/lttng-consumer.h
index 7ca94cc1d..e5672d7b7 100644
--- a/include/lttng/lttng-consumer.h
+++ b/include/lttng/lttng-consumer.h
@@ -28,8 +28,8 @@
 /*
  * When the receiving thread dies, we need to have a way to make the polling
  * thread exit eventually. If all FDs hang up (normal case when the
- * ltt-sessiond stops), we can exit cleanly, but if there is a problem and for
- * whatever reason some FDs remain open, the consumer should still exit
+ * lttng-sessiond stops), we can exit cleanly, but if there is a problem and
+ * for whatever reason some FDs remain open, the consumer should still exit
  * eventually.
  *
  * If the timeout is reached, it means that during this period no events
@@ -68,7 +68,8 @@ struct lttng_consumer_stream_list {
 enum lttng_consumer_type {
 	LTTNG_CONSUMER_UNKNOWN = 0,
 	LTTNG_CONSUMER_KERNEL,
-	LTTNG_CONSUMER_UST,
+	LTTNG_CONSUMER64_UST,
+	LTTNG_CONSUMER32_UST,
 };
 
 struct lttng_consumer_channel {
@@ -81,12 +82,15 @@ struct lttng_consumer_channel {
 	int wait_fd;
 	void *mmap_base;
 	size_t mmap_len;
-	struct shm_handle *handle;
+	struct lttng_ust_shm_handle *handle;
 	int nr_streams;
+	int shm_fd_is_copy;
+	int wait_fd_is_copy;
+	int cpucount;
 };
 
 /* Forward declaration for UST. */
-struct lib_ring_buffer;
+struct lttng_ust_lib_ring_buffer;
 
 /*
  * Internal representation of the streams, sessiond_key is used to identify
@@ -110,9 +114,12 @@ struct lttng_consumer_stream {
 	void *mmap_base;
 	size_t mmap_len;
 	enum lttng_event_output output; /* splice or mmap */
+	int shm_fd_is_copy;
+	int wait_fd_is_copy;
 	/* For UST */
-	struct lib_ring_buffer *buf;
+	struct lttng_ust_lib_ring_buffer *buf;
 	int cpu;
+	int hangup_flush_done;
 };
 
 /*
@@ -121,7 +128,8 @@ struct lttng_consumer_stream {
  */
 struct lttng_consumer_local_data {
 	/* function to call when data is available on a buffer */
-	int (*on_buffer_ready)(struct lttng_consumer_stream *stream);
+	int (*on_buffer_ready)(struct lttng_consumer_stream *stream,
+			struct lttng_consumer_local_data *ctx);
 	/*
 	 * function to call when we receive a new channel, it receives a
 	 * newly allocated channel, depending on the return code of this
@@ -272,7 +280,8 @@ int consumer_add_channel(struct lttng_consumer_channel *channel);
 
 extern struct lttng_consumer_local_data *lttng_consumer_create(
 		enum lttng_consumer_type type,
-		int (*buffer_ready)(struct lttng_consumer_stream *stream),
+		int (*buffer_ready)(struct lttng_consumer_stream *stream,
+			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));
@@ -294,4 +303,8 @@ extern void *lttng_consumer_thread_receive_fds(void *data);
 extern int lttng_consumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		int sock, struct pollfd *consumer_sockpoll);
 
+int 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);
+
 #endif /* _LTTNG_CONSUMER_H */