Skip to content

Commit

Permalink
Fix build error on cfg(crossbeam_loom)
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Jan 8, 2022
1 parent 85e2fe8 commit 9016759
Showing 1 changed file with 50 additions and 25 deletions.
75 changes: 50 additions & 25 deletions crossbeam-utils/src/atomic/atomic_cell.rs
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,16 @@ macro_rules! impl_arithmetic {
/// ```
#[inline]
pub fn fetch_add(&self, val: $t) -> $t {
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value = value.wrapping_add(val);
old
#[cfg(crossbeam_loom)]
unimplemented!("loom does not support non-atomic atomic ops");
#[cfg(not(crossbeam_loom))]
{
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value = value.wrapping_add(val);
old
}
}

/// Decrements the current value by `val` and returns the previous value.
Expand All @@ -336,11 +341,16 @@ macro_rules! impl_arithmetic {
/// ```
#[inline]
pub fn fetch_sub(&self, val: $t) -> $t {
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value = value.wrapping_sub(val);
old
#[cfg(crossbeam_loom)]
unimplemented!("loom does not support non-atomic atomic ops");
#[cfg(not(crossbeam_loom))]
{
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value = value.wrapping_sub(val);
old
}
}

/// Applies bitwise "and" to the current value and returns the previous value.
Expand All @@ -357,11 +367,16 @@ macro_rules! impl_arithmetic {
/// ```
#[inline]
pub fn fetch_and(&self, val: $t) -> $t {
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value &= val;
old
#[cfg(crossbeam_loom)]
unimplemented!("loom does not support non-atomic atomic ops");
#[cfg(not(crossbeam_loom))]
{
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value &= val;
old
}
}

/// Applies bitwise "or" to the current value and returns the previous value.
Expand All @@ -378,11 +393,16 @@ macro_rules! impl_arithmetic {
/// ```
#[inline]
pub fn fetch_or(&self, val: $t) -> $t {
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value |= val;
old
#[cfg(crossbeam_loom)]
unimplemented!("loom does not support non-atomic atomic ops");
#[cfg(not(crossbeam_loom))]
{
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value |= val;
old
}
}

/// Applies bitwise "xor" to the current value and returns the previous value.
Expand All @@ -399,11 +419,16 @@ macro_rules! impl_arithmetic {
/// ```
#[inline]
pub fn fetch_xor(&self, val: $t) -> $t {
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value ^= val;
old
#[cfg(crossbeam_loom)]
unimplemented!("loom does not support non-atomic atomic ops");
#[cfg(not(crossbeam_loom))]
{
let _guard = lock(self.value.get() as usize).write();
let value = unsafe { &mut *(self.value.get()) };
let old = *value;
*value ^= val;
old
}
}
}
};
Expand Down

0 comments on commit 9016759

Please sign in to comment.