Internal logging lazy-initialization

[lttng-ust.git] / src / lib / lttng-ust-ctl / ustctl.c

diff --git a/src/lib/lttng-ust-ctl/ustctl.c b/src/lib/lttng-ust-ctl/ustctl.c
index 4b0e3f76b2e56e3bb8332c1da1d5115ce3a022b7..394f197079b0d323a0cb312bde86f5ec4a88493d 100644 (file)
--- a/src/lib/lttng-ust-ctl/ustctl.c
+++ b/src/lib/lttng-ust-ctl/ustctl.c
@@ -32,7 +32,7 @@
 #include "lib/lttng-ust/lttng-tracer-core.h"
 #include "lib/lttng-ust/lttng-counter-client.h"
 
-#include "common/counter/smp.h"
+#include "common/smp.h"
 #include "common/counter/counter.h"
 
 /*
@@ -2534,7 +2534,7 @@ int ustctl_regenerate_statedump(int sock, int handle)
 
 int ustctl_get_nr_cpu_per_counter(void)
 {
-       return lttng_counter_num_possible_cpus();
+       return num_possible_cpus();
 }
 
 struct ustctl_daemon_counter *
@@ -2906,8 +2906,6 @@ void ustctl_init(void)
 static
 void ustctl_init(void)
 {
-       lttng_ust_logging_init();
-       lttng_ust_getenv_init();        /* Needs lttng_ust_logging_init() to be completed. */
        lttng_ust_clock_init();
        lttng_ust_ring_buffer_clients_init();
        lttng_ust_counter_clients_init();