sessiond: make disable_context static

[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 fe924747ac66843cf313197fa6ec3559d53c44c8..6646202b8c55efb351ed7eb14eba416b73dd3953 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/uuid.h>
+
+lttng_uuid sessiond_uuid;
 
 int ust_consumerd64_fd = -1;
 int ust_consumerd32_fd = -1;
@@ -30,11 +33,50 @@ 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;
 
-int apps_cmd_notify_pipe[2] = { -1, -1 };
+int kernel_poll_pipe[2] = { -1, -1 };
 
 pid_t ppid;
 pid_t child_ppid;
 
 struct sessiond_config config;
+
+struct consumer_data kconsumer_data = {
+       .type = LTTNG_CONSUMER_KERNEL,
+       .err_sock = -1,
+       .cmd_sock = -1,
+       .channel_monitor_pipe = -1,
+       .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
+       .lock = PTHREAD_MUTEX_INITIALIZER,
+};
+
+struct consumer_data ustconsumer64_data = {
+       .type = LTTNG_CONSUMER64_UST,
+       .err_sock = -1,
+       .cmd_sock = -1,
+       .channel_monitor_pipe = -1,
+       .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
+       .lock = PTHREAD_MUTEX_INITIALIZER,
+};
+
+struct consumer_data ustconsumer32_data = {
+       .type = LTTNG_CONSUMER32_UST,
+       .err_sock = -1,
+       .cmd_sock = -1,
+       .channel_monitor_pipe = -1,
+       .pid_mutex = PTHREAD_MUTEX_INITIALIZER,
+       .lock = 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();
+       }
+}