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

diff --git a/include/lttng/lttng-consumer.h b/include/lttng/lttng-consumer.h
index 7ca94cc1d..1a6afc22a 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
@@ -81,12 +81,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,8 +113,10 @@ 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;
 };