Skip to content

refactor(cubestore): Use OnceLock for GLOBAL_SINK #9023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2024
Merged

refactor(cubestore): Use OnceLock for GLOBAL_SINK #9023

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions rust/cubestore/cubestore/src/util/metrics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
use crate::CubeError;
use std::net::ToSocketAddrs;
use std::net::UdpSocket;
use std::sync::Once;

#[derive(Debug, PartialEq, Eq)]
pub enum Compatibility {
Expand Down Expand Up @@ -189,8 +188,9 @@ impl Sink {

mod global_sink {
use super::*;
static mut GLOBAL_SINK: Option<Sink> = None;
static ONCE: Once = Once::new();
use std::sync::OnceLock;

static GLOBAL_SINK: OnceLock<Option<Sink>> = OnceLock::new();

pub fn init(
bind_addr: impl ToSocketAddrs,
Expand All @@ -201,11 +201,9 @@ mod global_sink {
let s = Sink::connect(bind_addr, server_addr, mode, constant_tags)?;

let mut called = false;
ONCE.call_once(|| {
unsafe {
GLOBAL_SINK = Some(s);
}
GLOBAL_SINK.get_or_init(|| {
called = true;
Some(s)
});
if !called {
panic!("Metrics initialized twice or used before initialization");
Expand All @@ -214,9 +212,7 @@ mod global_sink {
}

pub(super) fn sink() -> &'static Option<Sink> {
// Ensure we synchronize access to GLOBAL_SINK.
ONCE.call_once(|| {});
unsafe { &GLOBAL_SINK }
GLOBAL_SINK.get_or_init(|| None)
}
}

Expand Down
Loading