Hide forward declaration of struct lttng_event_notifier_group

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

diff --git a/liblttng-ust/lttng-ring-buffer-metadata-client.h b/liblttng-ust/lttng-ring-buffer-metadata-client.h
index 98af899391650d2dc485e9bfdbf886ec624e4154..ae606b4cc21a577cd0b85746ef273d8bc4f357a4 100644 (file)
--- a/liblttng-ust/lttng-ring-buffer-metadata-client.h
+++ b/liblttng-ust/lttng-ring-buffer-metadata-client.h
@@ -8,7 +8,8 @@
 
 #include <stddef.h>
 #include <stdint.h>
-#include <lttng/ust-events.h>
+
+#include <ust-events-internal.h>
 #include "ust-bitfield.h"
 #include "ust-compat.h"
 #include "lttng-tracer.h"
@@ -34,14 +35,15 @@ struct metadata_record_header {
 
 static const struct lttng_ust_lib_ring_buffer_config client_config;
 
-static inline uint64_t lib_ring_buffer_clock_read(struct channel *chan)
+static inline uint64_t lib_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
        return 0;
 }
 
 static inline
 size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
-                                struct channel *chan, size_t offset,
+                                struct lttng_ust_lib_ring_buffer_channel *chan,
+                                size_t offset,
                                 size_t *pre_header_padding,
                                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                                 void *client_ctx)
@@ -52,14 +54,15 @@ size_t record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
 #include "../libringbuffer/api.h"
 #include "lttng-rb-clients.h"
 
-static uint64_t client_ring_buffer_clock_read(struct channel *chan)
+static uint64_t client_ring_buffer_clock_read(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
        return 0;
 }
 
 static
 size_t client_record_header_size(const struct lttng_ust_lib_ring_buffer_config *config,
-                                struct channel *chan, size_t offset,
+                                struct lttng_ust_lib_ring_buffer_channel *chan,
+                                size_t offset,
                                 size_t *pre_header_padding,
                                 struct lttng_ust_lib_ring_buffer_ctx *ctx,
                                 void *client_ctx)
@@ -83,7 +86,7 @@ static void client_buffer_begin(struct lttng_ust_lib_ring_buffer *buf, uint64_t
                                unsigned int subbuf_idx,
                                struct lttng_ust_shm_handle *handle)
 {
-       struct channel *chan = shmp(handle, buf->backend.chan);
+       struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, buf->backend.chan);
        struct metadata_packet_header *header =
                (struct metadata_packet_header *)
                        lib_ring_buffer_offset_address(&buf->backend,
@@ -114,7 +117,7 @@ static void client_buffer_end(struct lttng_ust_lib_ring_buffer *buf, uint64_t ts
                              unsigned int subbuf_idx, unsigned long data_size,
                              struct lttng_ust_shm_handle *handle)
 {
-       struct channel *chan = shmp(handle, buf->backend.chan);
+       struct lttng_ust_lib_ring_buffer_channel *chan = shmp(handle, buf->backend.chan);
        struct metadata_packet_header *header =
                (struct metadata_packet_header *)
                        lib_ring_buffer_offset_address(&buf->backend,
@@ -186,8 +189,6 @@ static const struct lttng_ust_lib_ring_buffer_config client_config = {
         .cb_ptr = &client_cb.parent,
 };
 
-const struct lttng_ust_client_lib_ring_buffer_client_cb *LTTNG_CLIENT_CALLBACKS = &client_cb;
-
 static
 struct lttng_channel *_channel_create(const char *name,
                                void *buf_addr,
@@ -236,12 +237,9 @@ int lttng_event_reserve(struct lttng_ust_lib_ring_buffer_ctx *ctx, uint32_t even
        ret = lib_ring_buffer_reserve(&client_config, ctx, NULL);
        if (ret)
                return ret;
-       if (caa_likely(ctx->ctx_len
-                       >= sizeof(struct lttng_ust_lib_ring_buffer_ctx))) {
-               if (lib_ring_buffer_backend_get_pages(&client_config, ctx,
-                               &ctx->backend_pages))
-                       return -EPERM;
-       }
+       if (lib_ring_buffer_backend_get_pages(&client_config, ctx,
+                       &ctx->backend_pages))
+               return -EPERM;
        return 0;
 }
 
@@ -259,7 +257,8 @@ void lttng_event_write(struct lttng_ust_lib_ring_buffer_ctx *ctx, const void *sr
 }
 
 static
-size_t lttng_packet_avail_size(struct channel *chan, struct lttng_ust_shm_handle *handle)
+size_t lttng_packet_avail_size(struct lttng_ust_lib_ring_buffer_channel *chan,
+               struct lttng_ust_shm_handle *handle)
 {
        unsigned long o_begin;
        struct lttng_ust_lib_ring_buffer *buf;
@@ -276,32 +275,33 @@ size_t lttng_packet_avail_size(struct channel *chan, struct lttng_ust_shm_handle
 
 #if 0
 static
-wait_queue_head_t *lttng_get_reader_wait_queue(struct channel *chan)
+wait_queue_head_t *lttng_get_reader_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
        return &chan->read_wait;
 }
 
 static
-wait_queue_head_t *lttng_get_hp_wait_queue(struct channel *chan)
+wait_queue_head_t *lttng_get_hp_wait_queue(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
        return &chan->hp_wait;
 }
 #endif //0
 
 static
-int lttng_is_finalized(struct channel *chan)
+int lttng_is_finalized(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
        return lib_ring_buffer_channel_is_finalized(chan);
 }
 
 static
-int lttng_is_disabled(struct channel *chan)
+int lttng_is_disabled(struct lttng_ust_lib_ring_buffer_channel *chan)
 {
        return lib_ring_buffer_channel_is_disabled(chan);
 }
 
 static
-int lttng_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle)
+int lttng_flush_buffer(struct lttng_ust_lib_ring_buffer_channel *chan,
+               struct lttng_ust_shm_handle *handle)
 {
        struct lttng_ust_lib_ring_buffer *buf;
        int shm_fd, wait_fd, wakeup_fd;
@@ -318,14 +318,14 @@ int lttng_flush_buffer(struct channel *chan, struct lttng_ust_shm_handle *handle
 static struct lttng_transport lttng_relay_transport = {
        .name = "relay-" RING_BUFFER_MODE_TEMPLATE_STRING "-mmap",
        .ops = {
+               .struct_size = sizeof(struct lttng_ust_channel_ops),
+
                .channel_create = _channel_create,
                .channel_destroy = lttng_channel_destroy,
                .event_reserve = lttng_event_reserve,
                .event_commit = lttng_event_commit,
                .event_write = lttng_event_write,
                .packet_avail_size = lttng_packet_avail_size,
-               //.get_reader_wait_queue = lttng_get_reader_wait_queue,
-               //.get_hp_wait_queue = lttng_get_hp_wait_queue,
                .is_finalized = lttng_is_finalized,
                .is_disabled = lttng_is_disabled,
                .flush_buffer = lttng_flush_buffer,