ExternalVendorCode/onefuzz
1
0
Fork 0
mirror of https://github.com/microsoft/onefuzz.git synced 2025-06-19 04:58:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use non-deprecated atomic method (#593)

Browse Source
This commit is contained in:
Joe Ranweiler
2021-02-24 14:41:24 -08:00
committed by GitHub
parent fb482e357e
commit ed86bb0099
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/agent/onefuzz-telemetry/src/lib.rs
View File

@ -200,18 +200,16 @@ mod global {
pub fn set_clients(instance: Option<TelemetryClient>, shared: Option<TelemetryClient>) { pub fn set_clients(instance: Option<TelemetryClient>, shared: Option<TelemetryClient>) {
use Ordering::SeqCst; use Ordering::SeqCst;
let last_state = STATE.compare_and_swap(UNSET, SETTING, SeqCst); let result = STATE.compare_exchange(UNSET, SETTING, SeqCst, SeqCst);
if last_state == SETTING { match result {
panic!("race while setting telemetry client"); Ok(SETTING) => panic!("race while setting telemetry client"),
Ok(SET) => panic!("tried to reset telemetry client"),
Ok(UNSET) => {}
Ok(state) => panic!("unknown telemetry client state while setting: {}", state),
Err(state) => panic!("failed to set telemetry client state: {}", state),
} }
if last_state == SET {
panic!("tried to reset telemetry client");
}
assert_eq!(last_state, UNSET, "unexpected telemetry client state");
unsafe { unsafe {
CLIENTS.instance = instance.map(RwLock::new); CLIENTS.instance = instance.map(RwLock::new);
CLIENTS.shared = shared.map(RwLock::new); CLIENTS.shared = shared.map(RwLock::new);
@ -230,18 +228,16 @@ mod global {
pub fn take_clients() -> Vec<TelemetryClient> { pub fn take_clients() -> Vec<TelemetryClient> {
use Ordering::SeqCst; use Ordering::SeqCst;
let last_state = STATE.compare_and_swap(SET, SETTING, SeqCst); let result = STATE.compare_exchange(SET, SETTING, SeqCst, SeqCst);
if last_state == SETTING { match result {
panic!("race while taking telemetry client"); Ok(SETTING) => panic!("race while taking telemetry client"),
Ok(SET) => {}
Ok(UNSET) => panic!("tried to take unset telemetry client"),
Ok(state) => panic!("unknown telemetry client state while taking: {}", state),
Err(state) => panic!("failed to take telemetry client state: {}", state),
} }
if last_state == UNSET {
panic!("tried to take unset telemetry client");
}
assert_eq!(last_state, SET, "unexpected telemetry client state");
let instance = unsafe { CLIENTS.instance.take() }; let instance = unsafe { CLIENTS.instance.take() };
let shared = unsafe { CLIENTS.shared.take() }; let shared = unsafe { CLIENTS.shared.take() };