Rename lttng_ust_lib_ring_buffer to lttng_ust_ring_buffer

[lttng-ust.git] / src / lib / lttng-ust / lttng-events.c

diff --git a/src/lib/lttng-ust/lttng-events.c b/src/lib/lttng-ust/lttng-events.c
index 13becb9111f13090606c9bdefef5679e7c9a42d7..e8f9fd9fa41808e3df7834288170ecc948ae466d 100644 (file)
--- a/src/lib/lttng-ust/lttng-events.c
+++ b/src/lib/lttng-ust/lttng-events.c
@@ -39,23 +39,21 @@
 #include "common/ust-fd.h"
 #include "common/dynamic-type.h"
 #include "common/ust-context-provider.h"
-#include "error.h"
 #include "lttng-ust-uuid.h"
 
-#include "tracepoint-internal.h"
-#include "string-utils.h"
+#include "common/tracepoint.h"
+#include "common/strutils.h"
 #include "lttng-bytecode.h"
 #include "lttng-tracer.h"
 #include "lttng-tracer-core.h"
 #include "lttng-ust-statedump.h"
 #include "context-internal.h"
 #include "lib/lttng-ust/events.h"
-#include "wait.h"
 #include "common/ringbuffer/shm.h"
 #include "common/ringbuffer/frontend_types.h"
 #include "common/ringbuffer/frontend.h"
 #include "common/counter/counter.h"
-#include "jhash.h"
+#include "common/jhash.h"
 #include <lttng/ust-abi.h>
 #include "context-provider-internal.h"
 
@@ -250,7 +248,7 @@ struct lttng_event_notifier_group *lttng_event_notifier_group_create(void)
 static
 void _lttng_channel_unmap(struct lttng_ust_channel_buffer *lttng_chan)
 {
-       struct lttng_ust_lib_ring_buffer_channel *chan;
+       struct lttng_ust_ring_buffer_channel *chan;
        struct lttng_ust_shm_handle *handle;
 
        cds_list_del(&lttng_chan->priv->node);
@@ -781,7 +779,7 @@ int lttng_event_recorder_create(const struct lttng_ust_event_desc *desc,
        event_recorder->parent->priv->desc = desc;
 
        if (desc->loglevel)
-               loglevel = *(*event_recorder->parent->priv->desc->loglevel);
+               loglevel = *(*desc->loglevel);
        else
                loglevel = TRACE_DEFAULT;
        if (desc->model_emf_uri)
@@ -2002,7 +2000,7 @@ void lttng_session_lazy_sync_event_enablers(struct lttng_ust_session *session)
  */
 void lttng_ust_context_set_session_provider(const char *name,
                size_t (*get_size)(void *priv, size_t offset),
-               void (*record)(void *priv, struct lttng_ust_lib_ring_buffer_ctx *ctx,
+               void (*record)(void *priv, struct lttng_ust_ring_buffer_ctx *ctx,
                        struct lttng_ust_channel_buffer *chan),
                void (*get_value)(void *priv, struct lttng_ust_ctx_value *value),
                void *priv)
@@ -2042,7 +2040,7 @@ void lttng_ust_context_set_session_provider(const char *name,
  */
 void lttng_ust_context_set_event_notifier_group_provider(const char *name,
                size_t (*get_size)(void *priv, size_t offset),
-               void (*record)(void *priv, struct lttng_ust_lib_ring_buffer_ctx *ctx,
+               void (*record)(void *priv, struct lttng_ust_ring_buffer_ctx *ctx,
                        struct lttng_ust_channel_buffer *chan),
                void (*get_value)(void *priv, struct lttng_ust_ctx_value *value),
                void *priv)