#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"
"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;
}
* 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();