Rename lttng_ust_lib_ring_buffer to lttng_ust_ring_buffer

[lttng-ust.git] / include / lttng / ust-events.h

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index ad739bd76e0c58c5577b2f04d50d3468a5cb8307..2b035d8fa457f2be335cdaa78b157184266070bf 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -37,7 +37,7 @@ extern "C" {
 
 struct lttng_ust_channel_buffer;
 struct lttng_ust_session;
-struct lttng_ust_lib_ring_buffer_ctx;
+struct lttng_ust_ring_buffer_ctx;
 struct lttng_ust_event_field;
 struct lttng_ust_registered_probe;
 
@@ -117,7 +117,7 @@ struct lttng_ust_type_integer {
 };
 
 #define lttng_ust_type_integer_define(_type, _byte_order, _base)       \
-       ((struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(struct lttng_ust_type_integer, { \
+       ((struct lttng_ust_type_common *) LTTNG_UST_COMPOUND_LITERAL(struct lttng_ust_type_integer, { \
                .parent = {                                             \
                        .type = lttng_ust_type_integer,                 \
                },                                                      \
@@ -148,7 +148,7 @@ struct lttng_ust_type_float {
                : 0))
 
 #define lttng_ust_type_float_define(_type)                             \
-       ((struct lttng_ust_type_common *) __LTTNG_COMPOUND_LITERAL(struct lttng_ust_type_float, { \
+       ((struct lttng_ust_type_common *) LTTNG_UST_COMPOUND_LITERAL(struct lttng_ust_type_float, { \
                .parent = {                                             \
                        .type = lttng_ust_type_float,                   \
                },                                                      \
@@ -422,14 +422,14 @@ struct lttng_ust_event_notifier {
        struct lttng_ust_event_notifier_private *priv;  /* Private event notifier interface */
 
        int eval_capture;                               /* Need to evaluate capture */
-       void (*notification_send)(struct lttng_ust_event_notifier *event_notifier,
+       void (*notification_send)(const struct lttng_ust_event_notifier *event_notifier,
                const char *stack_data,
                struct lttng_ust_notification_ctx *notif_ctx);
 
        /* End of base ABI. Fields below should be used after checking struct_size. */
 };
 
-struct lttng_ust_lib_ring_buffer_channel;
+struct lttng_ust_ring_buffer_channel;
 struct lttng_ust_channel_buffer_ops_private;
 
 /*
@@ -446,13 +446,13 @@ struct lttng_ust_channel_buffer_ops {
 
        struct lttng_ust_channel_buffer_ops_private *priv;      /* Private channel buffer ops interface */
 
-       int (*event_reserve)(struct lttng_ust_lib_ring_buffer_ctx *ctx);
-       void (*event_commit)(struct lttng_ust_lib_ring_buffer_ctx *ctx);
-       void (*event_write)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+       int (*event_reserve)(struct lttng_ust_ring_buffer_ctx *ctx);
+       void (*event_commit)(struct lttng_ust_ring_buffer_ctx *ctx);
+       void (*event_write)(struct lttng_ust_ring_buffer_ctx *ctx,
                        const void *src, size_t len, size_t alignment);
-       void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+       void (*event_strcpy)(struct lttng_ust_ring_buffer_ctx *ctx,
                        const char *src, size_t len);
-       void (*event_pstrcpy_pad)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+       void (*event_pstrcpy_pad)(struct lttng_ust_ring_buffer_ctx *ctx,
                        const char *src, size_t len);
 
        /* End of base ABI. Fields below should be used after checking struct_size. */