X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Ffrontend.h;h=838f88e8eecf50d836dafb52b833e3aa103c65b4;hb=15b385c8a645128e3ed89f7f840c1441223097a4;hp=b1ccddec1e8bfd3367a53f08714f5f153ed4a9b4;hpb=e92f3e285939848f248af08f11a39a04a7fcf852;p=lttng-ust.git

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index b1ccddec..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>
@@ -65,18 +67,8 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
 				size_t subbuf_size, size_t num_subbuf,
 				unsigned int switch_timer_interval,
 				unsigned int read_timer_interval,
-				int **shm_fd, int **wait_fd,
-				uint64_t **memory_map_size);
-
-/* channel_handle_create - for consumer. */
-extern
-struct lttng_ust_shm_handle *channel_handle_create(int shm_fd, int wait_fd,
-					uint64_t memory_map_size);
-
-/* channel_handle_add_stream - for consumer. */
-extern
-int channel_handle_add_stream(struct lttng_ust_shm_handle *handle,
-		int shm_fd, int wait_fd, uint64_t memory_map_size);
+				const int *stream_fds, int nr_stream_fds,
+				int64_t blocking_timeout);
 
 /*
  * channel_destroy finalizes all channel's buffers, waits for readers to
@@ -84,7 +76,7 @@ int channel_handle_add_stream(struct lttng_ust_shm_handle *handle,
  */
 extern
 void channel_destroy(struct channel *chan, struct lttng_ust_shm_handle *handle,
-		int shadow);
+		int consumer);
 
 
 /* Buffer read operations */
@@ -102,14 +94,38 @@ extern struct lttng_ust_lib_ring_buffer *channel_get_ring_buffer(
 				const struct lttng_ust_lib_ring_buffer_config *config,
 				struct channel *chan, int cpu,
 				struct lttng_ust_shm_handle *handle,
-				int **shm_fd, int **wait_fd,
-				uint64_t **memory_map_size);
+				int *shm_fd, int *wait_fd,
+				int *wakeup_fd,
+				uint64_t *memory_map_size);
+extern
+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_stream_close_wakeup_fd(const struct lttng_ust_lib_ring_buffer_config *config,
+		struct channel *chan,
+		struct lttng_ust_shm_handle *handle,
+		int cpu);
+
 extern int lib_ring_buffer_open_read(struct lttng_ust_lib_ring_buffer *buf,
-				     struct lttng_ust_shm_handle *handle,
-				     int shadow);
+				     struct lttng_ust_shm_handle *handle);
 extern void lib_ring_buffer_release_read(struct lttng_ust_lib_ring_buffer *buf,
-					 struct lttng_ust_shm_handle *handle,
-					 int shadow);
+					 struct lttng_ust_shm_handle *handle);
+
+/*
+ * Initialize signals for ring buffer. Should be called early e.g. by
+ * main() in the program to affect all threads.
+ */
+void lib_ringbuffer_signal_init(void);
 
 /*
  * Read sequence: snapshot, many get_subbuf/put_subbuf, move_consumer.
@@ -118,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);
@@ -149,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);