Cleanup: Remove unused max() macros from ring_buffer_frontend.c

[lttng-ust.git] / libringbuffer / frontend.h

diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index 2eda6e945b218c8b557886084202feb4b5151716..8c8517086828d1fc5c9cf2bf2c780b8a933fc653 100644 (file)
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -64,7 +64,8 @@ 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);
 
 /*
  * channel_destroy finalizes all channel's buffers, waits for readers to
@@ -94,12 +95,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);