Namespace 'lttng_alignof' to 'lttng_ust_rb_alignof'

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

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index ca3d19818b2bc6dd19134d950afc889dfa52395f..7090673dc4f6f846916067a23280f61c7711edd7 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -20,6 +20,7 @@
 #include <errno.h>
 #include <urcu/ref.h>
 #include <pthread.h>
+#include <limits.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -123,8 +124,8 @@ struct lttng_ust_type_integer {
                },                                                      \
                .struct_size = sizeof(struct lttng_ust_type_integer),   \
                .size = sizeof(_type) * CHAR_BIT,                       \
-               .alignment = lttng_alignof(_type) * CHAR_BIT,           \
-               .signedness = lttng_is_signed_type(_type),              \
+               .alignment = lttng_ust_rb_alignof(_type) * CHAR_BIT,    \
+               .signedness = lttng_ust_is_signed_type(_type),          \
                .reverse_byte_order = _byte_order != BYTE_ORDER,        \
                .base = _base,                                          \
        }))
@@ -156,7 +157,7 @@ struct lttng_ust_type_float {
                .exp_dig = sizeof(_type) * CHAR_BIT                     \
                        - lttng_ust_float_mant_dig(_type),              \
                .mant_dig = lttng_ust_float_mant_dig(_type),            \
-               .alignment = lttng_alignof(_type) * CHAR_BIT,           \
+               .alignment = lttng_ust_rb_alignof(_type) * CHAR_BIT,    \
                .reverse_byte_order = BYTE_ORDER != FLOAT_WORD_ORDER,   \
        }))
 
@@ -258,7 +259,8 @@ struct lttng_ust_event_field {
 struct lttng_ust_event_desc {
        uint32_t struct_size;                   /* Size of this structure. */
 
-       const char *name;
+       const char *event_name;
+       struct lttng_ust_probe_desc *probe_desc;
        void (*probe_callback)(void);
        struct lttng_event_ctx *ctx;            /* context */
        struct lttng_ust_event_field **fields;  /* event payload */
@@ -282,7 +284,7 @@ struct lttng_ust_event_desc {
 struct lttng_ust_probe_desc {
        uint32_t struct_size;                   /* Size of this structure. */
 
-       const char *provider;
+       const char *provider_name;
        struct lttng_ust_event_desc **event_desc;
        unsigned int nr_events;
        struct cds_list_head head;              /* chain registered probes */
@@ -451,7 +453,7 @@ struct lttng_ust_channel_buffer_ops {
                        const void *src, size_t len);
        void (*event_strcpy)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                        const char *src, size_t len);
-       void (*event_strcpy_pad)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
+       void (*event_pstrcpy_pad)(struct lttng_ust_lib_ring_buffer_ctx *ctx,
                        const char *src, size_t len);
 
        /* End of base ABI. Fields below should be used after checking struct_size. */
@@ -504,8 +506,6 @@ struct lttng_ust_channel_buffer {
        struct lttng_ust_channel_buffer_private *priv;  /* Private channel buffer interface */
 
        struct lttng_ust_channel_buffer_ops *ops;
-       struct lttng_ust_lib_ring_buffer_channel *chan; /* Channel buffers */
-       struct lttng_ust_shm_handle *handle;            /* shared-memory handle */
 
        /* End of base ABI. Fields below should be used after checking struct_size. */
 };