withinboredom/garage
1
0
Fork 0
forked from Deuxfleurs/garage
Code Issues Pull requests Projects Releases Wiki Activity

garage(tests): Add some unsafe-usage doc and tweaks

Browse source
This commit is contained in:
Jill 2022-02-04 17:53:46 +01:00
parent 5d19f3d2d7
commit cd13ea461b
Signed by untrusted user: KokaKiwi
GPG key ID: 09A5A2688F13FAC1
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/garage/tests/common/garage.rs
View file

@ -1,4 +1,3 @@
use std::env::var_os;
use std::mem::MaybeUninit; use std::mem::MaybeUninit;
use std::path::{Path, PathBuf}; use std::path::{Path, PathBuf};
use std::process; use std::process;
@ -186,6 +185,8 @@ static INSTANCE_INIT: Once = Once::new();
#[static_init::destructor] #[static_init::destructor]
extern "C" fn terminate_instance() { extern "C" fn terminate_instance() {
if INSTANCE_INIT.is_completed() { if INSTANCE_INIT.is_completed() {
// This block is sound as it depends on `INSTANCE_INIT` being completed, meaning `INSTANCE`
// is actually initialized.
unsafe { unsafe {
INSTANCE.assume_init_mut().terminate(); INSTANCE.assume_init_mut().terminate();
} }
@ -200,15 +201,17 @@ pub fn instance() -> &'static Instance {
INSTANCE.write(instance); INSTANCE.write(instance);
}); });
// This block is sound as it depends on `INSTANCE_INIT` being completed by calling `call_once` (blocking),
// meaning `INSTANCE` is actually initialized.
unsafe { INSTANCE.assume_init_ref() } unsafe { INSTANCE.assume_init_ref() }
} }
pub fn command(config_path: &Path) -> process::Command { pub fn command(config_path: &Path) -> process::Command {
use std::env;
let mut command = process::Command::new( let mut command = process::Command::new(
var_os("GARAGE_TEST_INTEGRATION_EXE") env::var("GARAGE_TEST_INTEGRATION_EXE")
.as_ref() .unwrap_or_else(|_| env!("CARGO_BIN_EXE_garage").to_owned()),
.and_then(|e| e.to_str())
.unwrap_or(env!("CARGO_BIN_EXE_garage")),
); );
command.arg("-c").arg(config_path); command.arg("-c").arg(config_path);