X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-events.c;h=e8f9fd9fa41808e3df7834288170ecc948ae466d;hb=042dbbc86aaf0d25b4922ecf268f406d31cd8986;hp=b33d6e1bfa4ea0c45101f0389d0b32e0a488f845;hpb=9c4fe08d87975f3f79227b1b5e7629d52a16b4fc;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-events.c b/src/lib/lttng-ust/lttng-events.c
index b33d6e1b..e8f9fd9f 100644
--- a/src/lib/lttng-ust/lttng-events.c
+++ b/src/lib/lttng-ust/lttng-events.c
@@ -41,15 +41,14 @@
 #include "common/ust-context-provider.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"
@@ -249,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);
@@ -780,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)
@@ -2001,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)
@@ -2041,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)