Fix: reintroduce lazy kernel modules load, fix empty syscall list

[lttng-tools.git] / src / bin / lttng-sessiond / globals.c

diff --git a/src/bin/lttng-sessiond/globals.c b/src/bin/lttng-sessiond/globals.c
index 6ca5a5a712901328d53e078cc0391b42680168d4..ef57a960dd47365b87c6f506d7f1220cb974886d 100644 (file)
--- a/src/bin/lttng-sessiond/globals.c
+++ b/src/bin/lttng-sessiond/globals.c
@@ -18,6 +18,9 @@
  */
 
 #include "lttng-sessiond.h"
+#include <common/compat/uuid.h>
+
+lttng_uuid sessiond_uuid;
 
 int ust_consumerd64_fd = -1;
 int ust_consumerd32_fd = -1;
@@ -30,7 +33,6 @@ struct notification_thread_handle *notification_thread_handle;
 
 struct lttng_ht *agent_apps_ht_by_sock = NULL;
 
-int kernel_tracer_fd = -1;
 struct lttng_kernel_tracer_version kernel_tracer_version;
 struct lttng_kernel_tracer_abi_version kernel_tracer_abi_version;
 
@@ -48,8 +50,6 @@ struct consumer_data kconsumer_data = {
        .channel_monitor_pipe = -1,
        .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
        .lock = PTHREAD_MUTEX_INITIALIZER,
-       .cond = PTHREAD_COND_INITIALIZER,
-       .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
 };
 
 struct consumer_data ustconsumer64_data = {
@@ -59,8 +59,6 @@ struct consumer_data ustconsumer64_data = {
        .channel_monitor_pipe = -1,
        .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
        .lock = PTHREAD_MUTEX_INITIALIZER,
-       .cond = PTHREAD_COND_INITIALIZER,
-       .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
 };
 
 struct consumer_data ustconsumer32_data = {
@@ -70,9 +68,15 @@ struct consumer_data ustconsumer32_data = {
        .channel_monitor_pipe = -1,
        .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
        .lock = PTHREAD_MUTEX_INITIALIZER,
-       .cond = PTHREAD_COND_INITIALIZER,
-       .cond_mutex = PTHREAD_MUTEX_INITIALIZER,
 };
 
 enum consumerd_state ust_consumerd_state;
 enum consumerd_state kernel_consumerd_state;
+
+static void __attribute__((constructor)) init_sessiond_uuid(void)
+{
+       if (lttng_uuid_generate(sessiond_uuid)) {
+               ERR("Failed to generate a session daemon UUID");
+               abort();
+       }
+}