Proxmox/proxmox
5
0
Fork 1
Code Issues Pull Requests Releases Activity

product-config: use inner mutability for PRODUCT_CONFIG

Browse Source 
with edition 2024 `static mut` references will be disallowed [1]. the
recommended way to work around this is to use inner mutability, so use a
`OnceLock` for the `PRODUCT_CONFIG` as that should not change throughout
the run time of an application.

[1]:
https://doc.rust-lang.org/nightly/edition-guide/rust-2024/static-mut-references.html

Signed-off-by: Shannon Sterz <s.sterz@proxmox.com>
This commit is contained in:
Shannon Sterz 2024-12-03 14:53:25 +01:00 committed by Dietmar Maurer
parent 115adf42bd
commit 8eae5a8330
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
proxmox-product-config/src/init.rs
View File

@ -1,18 +1,21 @@
use std::sync::OnceLock;
#[derive(Debug)]
struct ProxmoxProductConfig {
api_user: nix::unistd::User,
priv_user: nix::unistd::User,
}
static mut PRODUCT_CONFIG: Option<ProxmoxProductConfig> = None;
static PRODUCT_CONFIG: OnceLock<ProxmoxProductConfig> = OnceLock::new();
/// Initialize the global product configuration.
pub fn init(api_user: nix::unistd::User, priv_user: nix::unistd::User) {
unsafe {
PRODUCT_CONFIG = Some(ProxmoxProductConfig {
PRODUCT_CONFIG
.set(ProxmoxProductConfig {
api_user,
priv_user,
});
}
})
.expect("cannot init proxmox product config twice");
}
/// Returns the global api user set with [init].
@ -21,13 +24,11 @@ pub fn init(api_user: nix::unistd::User, priv_user: nix::unistd::User) {
///
/// Panics if [init] wasn't called before.
pub fn get_api_user() -> &'static nix::unistd::User {
unsafe {
&PRODUCT_CONFIG
.as_ref()
.get()
.expect("ProxmoxProductConfig is not initialized!")
.api_user
}
}
// Returns the global privileged user set with [init].
///
@ -35,10 +36,8 @@ pub fn get_api_user() -> &'static nix::unistd::User {
///
/// Panics if [init] wasn't called before.
pub fn get_priv_user() -> &'static nix::unistd::User {
unsafe {
&PRODUCT_CONFIG
.as_ref()
.get()
.expect("ProxmoxProductConfig is not initialized!")
.priv_user
}
}