X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel.cpp;fp=src%2Fbin%2Flttng-sessiond%2Fkernel.cpp;h=1bb8f80b8853d4599926981d7149bceccea25fb8;hp=ba82045ed86e51c18629efbbfe3a1711cd5a3dac;hb=d57239a083a64447902ec4d131e8bd5c324204b6;hpb=49cddecdbb1e042877ca3855b177ade68151030f diff --git a/src/bin/lttng-sessiond/kernel.cpp b/src/bin/lttng-sessiond/kernel.cpp index ba82045ed..1bb8f80b8 100644 --- a/src/bin/lttng-sessiond/kernel.cpp +++ b/src/bin/lttng-sessiond/kernel.cpp @@ -49,20 +49,6 @@ #include #include -/* - * Key used to reference a channel between the sessiond and the consumer. This - * is only read and updated with the session_list lock held. - */ -static uint64_t next_kernel_channel_key; - -static const char *module_proc_lttng = "/proc/lttng"; - -static int kernel_tracer_fd = -1; -static nonstd::optional kernel_tracer_status = nonstd::nullopt; -static int kernel_tracer_event_notifier_group_fd = -1; -static int kernel_tracer_event_notifier_group_notification_fd = -1; -static struct cds_lfht *kernel_token_to_event_notifier_rule_ht; - namespace { /* * On some architectures, calling convention details are embedded in the symbol @@ -87,6 +73,20 @@ static inline uint64_t sanitize_uprobe_offset(uint64_t raw_offset) return raw_offset; } #endif + +/* + * Key used to reference a channel between the sessiond and the consumer. This + * is only read and updated with the session_list lock held. + */ +uint64_t next_kernel_channel_key; + +const char *module_proc_lttng = "/proc/lttng"; + +int kernel_tracer_fd = -1; +nonstd::optional kernel_tracer_status = nonstd::nullopt; +int kernel_tracer_event_notifier_group_fd = -1; +int kernel_tracer_event_notifier_group_notification_fd = -1; +struct cds_lfht *kernel_token_to_event_notifier_rule_ht; } /* namespace */ /*