X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend.h;h=838f88e8eecf50d836dafb52b833e3aa103c65b4;hb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;hp=2eda6e945b218c8b557886084202feb4b5151716;hpb=03d2d2938911e2641038313211b08546338953c3;p=lttng-ust.git

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index 2eda6e94..838f88e8 100644
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -28,6 +28,8 @@
  *
  * See ring_buffer_frontend.c for more information on wait-free algorithms.
  */
+#include <stddef.h>
+#include <stdint.h>
 
 #include <urcu/compiler.h>
 #include <urcu/uatomic.h>
@@ -64,7 +66,9 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 				void *buf_addr,
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
-				unsigned int read_timer_interval);
+				unsigned int read_timer_interval,
+				const int *stream_fds, int nr_stream_fds,
+				int64_t blocking_timeout);
 
 /*
  * channel_destroy finalizes all channel's buffers, waits for readers to
@@ -94,12 +98,20 @@ extern struct lttng_ust_lib_ring_buffer *channel_get_ring_buffer(
 				int *wakeup_fd,
 				uint64_t *memory_map_size);
 extern
-int ring_buffer_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
+int ring_buffer_channel_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
+			struct channel *chan,
+			struct lttng_ust_shm_handle *handle);
+extern
+int ring_buffer_channel_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
+			struct channel *chan,
+			struct lttng_ust_shm_handle *handle);
+extern
+int ring_buffer_stream_close_wait_fd(const struct lttng_ust_lib_ring_buffer_config *config,
 		struct channel *chan,
 		struct lttng_ust_shm_handle *handle,
 		int cpu);
 extern
-int ring_buffer_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
+int ring_buffer_stream_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
 		struct channel *chan,
 		struct lttng_ust_shm_handle *handle,
 		int cpu);
@@ -122,6 +134,11 @@ extern int lib_ring_buffer_snapshot(struct lttng_ust_lib_ring_buffer *buf,
 				    unsigned long *consumed,
 				    unsigned long *produced,
 				    struct lttng_ust_shm_handle *handle);
+extern int lib_ring_buffer_snapshot_sample_positions(
+				    struct lttng_ust_lib_ring_buffer *buf,
+				    unsigned long *consumed,
+				    unsigned long *produced,
+				    struct lttng_ust_shm_handle *handle);
 extern void lib_ring_buffer_move_consumer(struct lttng_ust_lib_ring_buffer *buf,
 					  unsigned long consumed_new,
 					  struct lttng_ust_shm_handle *handle);
@@ -153,9 +170,14 @@ static inline
 void lib_ring_buffer_put_next_subbuf(struct lttng_ust_lib_ring_buffer *buf,
 				     struct lttng_ust_shm_handle *handle)
 {
+	struct channel *chan;
+
+	chan = shmp(handle, buf->backend.chan);
+	if (!chan)
+		return;
 	lib_ring_buffer_put_subbuf(buf, handle);
-	lib_ring_buffer_move_consumer(buf, subbuf_align(buf->cons_snapshot,
-							shmp(handle, buf->backend.chan)), handle);
+	lib_ring_buffer_move_consumer(buf, subbuf_align(buf->cons_snapshot, chan),
+			handle);
 }
 
 extern void channel_reset(struct channel *chan);