janis/executor
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

taggedatomicptr: refactor

Browse source
This commit is contained in:
Janis 2025-02-21 20:36:30 +01:00
parent bc57d221bc
commit 60942daca5
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/praetor/mod.rs
View file

@ -85,8 +85,7 @@ mod util {
pub fn ptr(&self, order: Ordering) -> NonNull<T> { pub fn ptr(&self, order: Ordering) -> NonNull<T> {
unsafe { unsafe {
NonNull::new_unchecked(self.0.load(order) as _) NonNull::new_unchecked(self.0.load(order).map_addr(|addr| addr & !Self::mask()) as _)
.map_addr(|addr| NonZero::new_unchecked(addr.get() & !Self::mask()))
} }
} }
@ -113,8 +112,8 @@ mod util {
let mask = Self::mask(); let mask = Self::mask();
let old_ptr = self.0.load(failure); let old_ptr = self.0.load(failure);
let old = old_ptr.with_addr((old_ptr.addr() & !mask) | (old & mask)); let old = old_ptr.map_addr(|addr| (addr & !mask) | (old & mask));
let new = old_ptr.with_addr((old_ptr.addr() & !mask) | (new & mask)); let new = old_ptr.map_addr(|addr| (addr & !mask) | (new & mask));
let result = cmpxchg(&self.0, old, new, success, failure); let result = cmpxchg(&self.0, old, new, success, failure);
@ -182,6 +181,7 @@ mod util {
loop { loop {
let ptr = self.0.load(failure); let ptr = self.0.load(failure);
let new = ptr.with_addr((ptr.addr() & !mask) | (tag & mask)); let new = ptr.with_addr((ptr.addr() & !mask) | (tag & mask));
if self if self
.0 .0
.compare_exchange_weak(ptr, new, success, failure) .compare_exchange_weak(ptr, new, success, failure)
@ -196,8 +196,8 @@ mod util {
let mask = Self::mask(); let mask = Self::mask();
let ptr = self.0.load(order); let ptr = self.0.load(order);
let tag = ptr.addr() & mask; let tag = ptr.addr() & mask;
let addr = ptr.addr() & !mask; let ptr = ptr.map_addr(|addr| addr & !mask);
let ptr = unsafe { NonNull::new_unchecked(ptr.with_addr(addr).cast()) }; let ptr = unsafe { NonNull::new_unchecked(ptr.cast()) };
(ptr, tag) (ptr, tag)
} }
} }