From d57239a083a64447902ec4d131e8bd5c324204b6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 5 Dec 2023 14:26:42 -0500 Subject: [PATCH] sessiond: kernel: clean-up: move static variables to anonymous namespace MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau Change-Id: I3ee0e5ff2ff4c47c23f6f27f5707be08107f70f1 --- src/bin/lttng-sessiond/kernel.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) 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 */ /* -- 2.34.1