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

TaggedAtomicPtr to named struct

Browse source
This commit is contained in:
Janis 2025-06-17 14:45:50 +02:00
parent e590dc4509
commit dc820fc64a
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/praetor/mod.rs
View file

@ -89,7 +89,10 @@ mod util {
// anything, but generally have an alignment of 8, and can be specified to // anything, but generally have an alignment of 8, and can be specified to
// be aligned to `n` with `#[repr(align(n))]`. // be aligned to `n` with `#[repr(align(n))]`.
#[repr(transparent)] #[repr(transparent)]
pub struct TaggedAtomicPtr<T, const BITS: usize>(AtomicPtr<()>, PhantomData<T>); pub struct TaggedAtomicPtr<T, const BITS: usize> {
ptr: AtomicPtr<()>,
_pd: PhantomData<T>,
}
impl<T, const BITS: usize> TaggedAtomicPtr<T, BITS> { impl<T, const BITS: usize> TaggedAtomicPtr<T, BITS> {
const fn mask() -> usize { const fn mask() -> usize {
@ -99,16 +102,16 @@ mod util {
pub fn new(ptr: *mut T, tag: usize) -> TaggedAtomicPtr<T, BITS> { pub fn new(ptr: *mut T, tag: usize) -> TaggedAtomicPtr<T, BITS> {
debug_assert!(core::mem::align_of::<T>().ilog2() as usize >= BITS); debug_assert!(core::mem::align_of::<T>().ilog2() as usize >= BITS);
let mask = Self::mask(); let mask = Self::mask();
Self( Self {
AtomicPtr::new(ptr.with_addr((ptr.addr() & !mask) | (tag & mask)).cast()), ptr: AtomicPtr::new(ptr.with_addr((ptr.addr() & !mask) | (tag & mask)).cast()),
PhantomData, _pd: PhantomData,
) }
} }
pub fn ptr(&self, order: Ordering) -> NonNull<T> { pub fn ptr(&self, order: Ordering) -> NonNull<T> {
unsafe { unsafe {
NonNull::new_unchecked( NonNull::new_unchecked(
self.0 self.ptr
.load(order) .load(order)
.map_addr(|addr| addr & !Self::mask()) .map_addr(|addr| addr & !Self::mask())
.cast(), .cast(),
@ -117,7 +120,7 @@ mod util {
} }
pub fn tag(&self, order: Ordering) -> usize { pub fn tag(&self, order: Ordering) -> usize {
self.0.load(order).addr() & Self::mask() self.ptr.load(order).addr() & Self::mask()
} }
/// returns tag /// returns tag
@ -137,12 +140,12 @@ mod util {
) -> Result<*mut (), *mut ()>, ) -> Result<*mut (), *mut ()>,
) -> Result<usize, usize> { ) -> Result<usize, usize> {
let mask = Self::mask(); let mask = Self::mask();
let old_ptr = self.0.load(failure); let old_ptr = self.ptr.load(failure);
let old = old_ptr.map_addr(|addr| (addr & !mask) | (old & mask)); let old = old_ptr.map_addr(|addr| (addr & !mask) | (old & mask));
let new = old_ptr.map_addr(|addr| (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.ptr, old, new, success, failure);
result result
.map(|ptr| ptr.addr() & mask) .map(|ptr| ptr.addr() & mask)
@ -191,10 +194,10 @@ mod util {
let mask = Self::mask(); let mask = Self::mask();
let ptr = ptr.cast::<()>(); let ptr = ptr.cast::<()>();
loop { loop {
let old = self.0.load(failure); let old = self.ptr.load(failure);
let new = ptr.map_addr(|addr| (addr & !mask) | (old.addr() & mask)); let new = ptr.map_addr(|addr| (addr & !mask) | (old.addr() & mask));
if self if self
.0 .ptr
.compare_exchange_weak(old, new, success, failure) .compare_exchange_weak(old, new, success, failure)
.is_ok() .is_ok()
{ {
@ -206,11 +209,11 @@ mod util {
pub fn set_tag(&self, tag: usize, success: Ordering, failure: Ordering) { pub fn set_tag(&self, tag: usize, success: Ordering, failure: Ordering) {
let mask = Self::mask(); let mask = Self::mask();
loop { loop {
let ptr = self.0.load(failure); let ptr = self.ptr.load(failure);
let new = ptr.map_addr(|addr| (addr & !mask) | (tag & mask)); let new = ptr.map_addr(|addr| (addr & !mask) | (tag & mask));
if self if self
.0 .ptr
.compare_exchange_weak(ptr, new, success, failure) .compare_exchange_weak(ptr, new, success, failure)
.is_ok() .is_ok()
{ {
@ -221,7 +224,7 @@ mod util {
pub fn ptr_and_tag(&self, order: Ordering) -> (NonNull<T>, usize) { pub fn ptr_and_tag(&self, order: Ordering) -> (NonNull<T>, usize) {
let mask = Self::mask(); let mask = Self::mask();
let ptr = self.0.load(order); let ptr = self.ptr.load(order);
let tag = ptr.addr() & mask; let tag = ptr.addr() & mask;
let ptr = ptr.map_addr(|addr| addr & !mask); let ptr = ptr.map_addr(|addr| addr & !mask);
let ptr = unsafe { NonNull::new_unchecked(ptr.cast()) }; let ptr = unsafe { NonNull::new_unchecked(ptr.cast()) };