Export consumer ABI, implement ring buffer modifications for consumer

[lttng-ust.git] / libust / ltt-ring-buffer-client.h

diff --git a/libust/ltt-ring-buffer-client.h b/libust/ltt-ring-buffer-client.h
index 2fe854a383d8821df6e2f1855df13c40b26e6c9a..f3a1a27aaca49629e5831de7b3a2156993f68cd3 100644 (file)
--- a/libust/ltt-ring-buffer-client.h
+++ b/libust/ltt-ring-buffer-client.h
@@ -380,11 +380,14 @@ struct ltt_channel *_channel_create(const char *name,
                                struct ltt_channel *ltt_chan, 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,
+                               int *shm_fd, int *wait_fd,
+                               uint64_t *memory_map_size)
 {
        ltt_chan->handle = channel_create(&client_config, name, ltt_chan, buf_addr,
                              subbuf_size, num_subbuf, switch_timer_interval,
-                             read_timer_interval);
+                             read_timer_interval, shm_fd, wait_fd,
+                             memory_map_size);
        if (!ltt_chan->handle)
                return NULL;
        ltt_chan->chan = shmp(ltt_chan->handle, ltt_chan->handle->chan);
@@ -399,13 +402,17 @@ void ltt_channel_destroy(struct ltt_channel *ltt_chan)
 
 static
 struct lib_ring_buffer *ltt_buffer_read_open(struct channel *chan,
-                                            struct shm_handle *handle)
+                                            struct shm_handle *handle,
+                                            int *shm_fd, int *wait_fd,
+                                            uint64_t *memory_map_size)
 {
        struct lib_ring_buffer *buf;
        int cpu;
 
        for_each_channel_cpu(cpu, chan) {
-               buf = channel_get_ring_buffer(&client_config, chan, cpu, handle);
+               buf = channel_get_ring_buffer(&client_config, chan,
+                               cpu, handle, shm_fd, wait_fd,
+                               memory_map_size);
                if (!lib_ring_buffer_open_read(buf, handle))
                        return buf;
        }