Rename lttng_ust_lib_ring_buffer to lttng_ust_ring_buffer

[lttng-ust.git] / include / lttng / ust-tracepoint-event.h

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 885093a2db4a7145f01742e9ace15e688dfdd54f..28684092bde07213a1fcbe9be5990f0c582a96dc 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -413,14 +413,14 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
 #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _nowrite)       \
        if (0)                                                                   \
                (void) (_src);  /* Unused */                                     \
-       __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
+       __event_len += lttng_ust_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
        __event_len += sizeof(_type);
 
 #undef _ctf_float
 #define _ctf_float(_type, _item, _src, _nowrite)                                \
        if (0)                                                                   \
                (void) (_src);  /* Unused */                                     \
-       __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
+       __event_len += lttng_ust_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
        __event_len += sizeof(_type);
 
 #undef _ctf_array_encoded
@@ -428,7 +428,7 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
                        _nowrite, _elem_type_base)                               \
        if (0)                                                                   \
                (void) (_src);  /* Unused */                                     \
-       __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
+       __event_len += lttng_ust_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
        __event_len += sizeof(_type) * (_length);
 
 #undef _ctf_sequence_encoded
@@ -436,9 +436,9 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args));
                        _src_length, _encoding, _nowrite, _elem_type_base)       \
        if (0)                                                                   \
                (void) (_src);  /* Unused */                                     \
-       __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_length_type));   \
+       __event_len += lttng_ust_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_length_type));   \
        __event_len += sizeof(_length_type);                                   \
-       __event_len += lttng_ust_lib_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
+       __event_len += lttng_ust_ring_buffer_align(__event_len, lttng_ust_rb_alignof(_type)); \
        __dynamic_len[__dynamic_len_idx] = (_src_length);                      \
        __event_len += sizeof(_type) * __dynamic_len[__dynamic_len_idx];       \
        __dynamic_len_idx++;
@@ -889,12 +889,12 @@ void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))         \
                size_t __event_len, __event_align;                            \
                struct lttng_ust_event_recorder *__event_recorder = (struct lttng_ust_event_recorder *) __event->child; \
                struct lttng_ust_channel_buffer *__chan = __event_recorder->chan; \
-               struct lttng_ust_lib_ring_buffer_ctx __ctx;                   \
+               struct lttng_ust_ring_buffer_ctx __ctx;               \
                                                                              \
                __event_len = __event_get_size__##_provider##___##_name(__stackvar.__dynamic_len, \
                         _TP_ARGS_DATA_VAR(_args));                           \
                __event_align = __event_get_align__##_provider##___##_name(_TP_ARGS_VAR(_args)); \
-               lttng_ust_lib_ring_buffer_ctx_init(&__ctx, __event_recorder, __event_len, __event_align, \
+               lttng_ust_ring_buffer_ctx_init(&__ctx, __event_recorder, __event_len, __event_align, \
                                _TP_IP_PARAM(TP_IP_PARAM));                   \
                __ret = __chan->ops->event_reserve(&__ctx);                   \
                if (__ret < 0)                                                \
@@ -969,21 +969,21 @@ static const char __tp_event_signature___##_provider##___##_name[] =      \
  * mangled.
  */
 #ifdef __cplusplus
-#define LTTNG_TP_EXTERN_C extern "C"
+#define LTTNG_UST_TP_EXTERN_C extern "C"
 #else
-#define LTTNG_TP_EXTERN_C
+#define LTTNG_UST_TP_EXTERN_C
 #endif
 
 #undef TRACEPOINT_LOGLEVEL
 #define TRACEPOINT_LOGLEVEL(__provider, __name, __loglevel)               \
 static const int _loglevel_value___##__provider##___##__name = __loglevel; \
-LTTNG_TP_EXTERN_C const int *_loglevel___##__provider##___##__name        \
+LTTNG_UST_TP_EXTERN_C const int *_loglevel___##__provider##___##__name    \
                __attribute__((visibility("hidden"))) =                    \
                &_loglevel_value___##__provider##___##__name;
 
 #include TRACEPOINT_INCLUDE
 
-#undef LTTNG_TP_EXTERN_C
+#undef LTTNG_UST_TP_EXTERN_C
 
 /*
  * Stage 6.1 of tracepoint event generation.
@@ -1001,19 +1001,19 @@ LTTNG_TP_EXTERN_C const int *_loglevel___##__provider##___##__name         \
  * mangled.
  */
 #ifdef __cplusplus
-#define LTTNG_TP_EXTERN_C extern "C"
+#define LTTNG_UST_TP_EXTERN_C extern "C"
 #else
-#define LTTNG_TP_EXTERN_C
+#define LTTNG_UST_TP_EXTERN_C
 #endif
 
 #undef TRACEPOINT_MODEL_EMF_URI
 #define TRACEPOINT_MODEL_EMF_URI(__provider, __name, __uri)               \
-LTTNG_TP_EXTERN_C const char *_model_emf_uri___##__provider##___##__name   \
+LTTNG_UST_TP_EXTERN_C const char *_model_emf_uri___##__provider##___##__name   \
                __attribute__((visibility("hidden"))) = __uri;             \
 
 #include TRACEPOINT_INCLUDE
 
-#undef LTTNG_TP_EXTERN_C
+#undef LTTNG_UST_TP_EXTERN_C
 
 /*
  * Stage 7.0 of tracepoint event generation.