X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fglobals.c;h=82a51512ad4e1dea80cc263a92be347d6aa45765;hp=63fd799386581059d80f4235593f489a1f76f4fc;hb=917a718d4ec336ca98820f3cf56a2db57fc9b1dd;hpb=bc26e826ebd59d3888e6db0d4985cfb3444f5c09 diff --git a/src/bin/lttng-sessiond/globals.c b/src/bin/lttng-sessiond/globals.c index 63fd79938..82a51512a 100644 --- a/src/bin/lttng-sessiond/globals.c +++ b/src/bin/lttng-sessiond/globals.c @@ -31,6 +31,8 @@ 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 }; @@ -39,3 +41,39 @@ 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;