From 6c991cc2cd5b3510bc5357c962cc653c20fdcfd8 Mon Sep 17 00:00:00 2001 From: ccgauche Date: Wed, 17 Feb 2021 14:19:02 +0100 Subject: [PATCH] Changed to less restrictive memory ordering --- common/sys/src/plugin/memory_manager.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/sys/src/plugin/memory_manager.rs b/common/sys/src/plugin/memory_manager.rs index 00ae92dd54..1884fe74aa 100644 --- a/common/sys/src/plugin/memory_manager.rs +++ b/common/sys/src/plugin/memory_manager.rs @@ -24,16 +24,16 @@ impl EcsAccessManager { // pointer will never be corrupted during the execution of the function! pub fn execute_with(&self, world: &World, func: impl FnOnce() -> T) -> T { self.ecs_pointer - .store(world as *const _ as *mut _, Ordering::SeqCst); + .store(world as *const _ as *mut _, Ordering::Relaxed); let out = func(); self.ecs_pointer - .store(std::ptr::null_mut::<_>(), Ordering::SeqCst); + .store(std::ptr::null_mut::<_>(), Ordering::Relaxed); out } pub fn get(&self) -> Option<&World> { // ptr::as_ref will automatically check for null - unsafe { self.ecs_pointer.load(Ordering::SeqCst).as_ref() } + unsafe { self.ecs_pointer.load(Ordering::Relaxed).as_ref() } } }