libust 2.0 + ringbuffer + TRACEPOINT_EVENT builds and runs

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

diff --git a/libust/ltt-ring-buffer-metadata-client.h b/libust/ltt-ring-buffer-metadata-client.h
index 1ea41176b123ece92d855fb80cd022cef52f0256..be9e4fb6781f4803ebc5de5ab3c5c1b23cf43ac7 100644 (file)
--- a/libust/ltt-ring-buffer-metadata-client.h
+++ b/libust/ltt-ring-buffer-metadata-client.h
@@ -9,8 +9,8 @@
  */
 
 #include <stdint.h>
+#include <ust/lttng-events.h>
 #include "ust/bitfield.h"
-#include "ltt-events.h"
 #include "ltt-tracer.h"
 #include "../libringbuffer/frontend_types.h"
 
@@ -149,22 +149,21 @@ static const struct lib_ring_buffer_config client_config = {
 };
 
 static
-struct channel *_channel_create(const char *name,
+struct shm_handle *_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,
-                               int *shmid)
+                               unsigned int read_timer_interval)
 {
        return channel_create(&client_config, name, ltt_chan, buf_addr,
                              subbuf_size, num_subbuf, switch_timer_interval,
-                             read_timer_interval, shmid);
+                             read_timer_interval);
 }
 
 static
-void ltt_channel_destroy(struct channel *chan)
+void ltt_channel_destroy(struct shm_handle *handle)
 {
-       channel_destroy(chan);
+       channel_destroy(handle);
 }
 
 static