X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fglobals.c;h=6ca5a5a712901328d53e078cc0391b42680168d4;hp=63fd799386581059d80f4235593f489a1f76f4fc;hb=971a61c658e35f7e2a71040455a273320b409636;hpb=e32d7f274604b77bcd83c24994e88df3761ed658

diff --git a/src/bin/lttng-sessiond/globals.c b/src/bin/lttng-sessiond/globals.c
index 63fd79938..6ca5a5a71 100644
--- a/src/bin/lttng-sessiond/globals.c
+++ b/src/bin/lttng-sessiond/globals.c
@@ -31,11 +31,48 @@ 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,
+	.cond = PTHREAD_COND_INITIALIZER,
+	.cond_mutex = 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,
+	.cond = PTHREAD_COND_INITIALIZER,
+	.cond_mutex = 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,
+	.cond = PTHREAD_COND_INITIALIZER,
+	.cond_mutex = PTHREAD_MUTEX_INITIALIZER,
+};
+
+enum consumerd_state ust_consumerd_state;
+enum consumerd_state kernel_consumerd_state;