X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-ust-comm.c;h=083de26d95184820e1a945f0a891c2ffebaceb9a;hb=58f8447848dfbfa79367607af7845547d47a08d4;hp=15cb555028d979ff656ddbcf9e3c66e98f190c10;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-ust-comm.c b/src/lib/lttng-ust/lttng-ust-comm.c
index 15cb5550..083de26d 100644
--- a/src/lib/lttng-ust/lttng-ust-comm.c
+++ b/src/lib/lttng-ust/lttng-ust-comm.c
@@ -25,7 +25,6 @@
 #include <signal.h>
 #include <limits.h>
 #include <urcu/uatomic.h>
-#include "futex.h"
 #include <urcu/compiler.h>
 #include <lttng/urcu/urcu-ust.h>
 
@@ -39,6 +38,7 @@
 #include <lttng/ust-thread.h>
 #include <lttng/ust-tracer.h>
 #include <urcu/tls-compat.h>
+#include "common/compat/futex.h"
 #include "common/ustcomm.h"
 #include "common/ust-fd.h"
 #include "common/logging.h"
@@ -50,9 +50,9 @@
 #include "common/ringbuffer/rb-init.h"
 #include "lttng-ust-statedump.h"
 #include "clock.h"
-#include "common/ringbuffer/getcpu.h"
-#include "getenv.h"
-#include "ust-events-internal.h"
+#include "lib/lttng-ust/getcpu.h"
+#include "common/getenv.h"
+#include "lib/lttng-ust/events.h"
 #include "context-internal.h"
 #include "common/align.h"
 #include "lttng-counter-client.h"
@@ -1727,7 +1727,7 @@ void wait_for_sessiond(struct sock_info *sock_info)
 "Please upgrade your kernel "
 "(fix is commit 9ea71503a8ed9184d2d0b8ccc4d269d05f7940ae in Linux kernel "
 "mainline). LTTng-UST will use polling mode fallback.");
-			if (ust_err_debug_enabled())
+			if (lttng_ust_logging_debug_enabled())
 				PERROR("futex");
 			goto end_wait;
 		}
@@ -2120,12 +2120,12 @@ void lttng_ust_init(void)
 	 * sessiond (otherwise leading to errors when trying to create
 	 * sessiond before the init functions are completed).
 	 */
-	ust_err_init();
-	lttng_ust_getenv_init();	/* Needs ust_err_init() to be completed. */
+	lttng_ust_logging_init();
+	lttng_ust_getenv_init();	/* Needs lttng_ust_logging_init() to be completed. */
 	lttng_ust_tp_init();
 	lttng_ust_init_fd_tracker();
 	lttng_ust_clock_init();
-	lttng_ust_getcpu_init();
+	lttng_ust_getcpu_plugin_init();
 	lttng_ust_statedump_init();
 	lttng_ust_ring_buffer_clients_init();
 	lttng_ust_counter_clients_init();