Skip to content

Revert atomicrmw {max, min, umax, umin} #8151

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert atomicrmw {max, min, umax, umin} #8151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 0 additions & 82 deletions src/libstd/unstable/atomics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,18 +205,6 @@ impl AtomicInt {
pub fn fetch_sub(&mut self, val: int, order: Ordering) -> int {
unsafe { atomic_sub(&mut self.v, val, order) }
}

/// Returns the old value
#[inline]
pub fn fetch_min(&mut self, val: int, order: Ordering) -> int {
unsafe { atomic_min(&mut self.v, val, order) }
}

/// Returns the old value
#[inline]
pub fn fetch_max(&mut self, val: int, order: Ordering) -> int {
unsafe { atomic_max(&mut self.v, val, order) }
}
}

impl AtomicUint {
Expand Down Expand Up @@ -255,18 +243,6 @@ impl AtomicUint {
pub fn fetch_sub(&mut self, val: uint, order: Ordering) -> uint {
unsafe { atomic_sub(&mut self.v, val, order) }
}

/// Returns the old value
#[inline]
pub fn fetch_min(&mut self, val: uint, order: Ordering) -> uint {
unsafe { atomic_umin(&mut self.v, val, order) }
}

/// Returns the old value
#[inline]
pub fn fetch_max(&mut self, val: uint, order: Ordering) -> uint {
unsafe { atomic_umax(&mut self.v, val, order) }
}
}

impl<T> AtomicPtr<T> {
Expand Down Expand Up @@ -515,64 +491,6 @@ pub unsafe fn atomic_xor<T>(dst: &mut T, val: T, order: Ordering) -> T {
}


#[inline]
pub unsafe fn atomic_max<T>(dst: &mut T, val: T, order: Ordering) -> T {
let dst = cast::transmute(dst);
let val = cast::transmute(val);

cast::transmute(match order {
Acquire => intrinsics::atomic_max_acq(dst, val),
Release => intrinsics::atomic_max_rel(dst, val),
AcqRel => intrinsics::atomic_max_acqrel(dst, val),
Relaxed => intrinsics::atomic_max_relaxed(dst, val),
_ => intrinsics::atomic_max(dst, val)
})
}


#[inline]
pub unsafe fn atomic_min<T>(dst: &mut T, val: T, order: Ordering) -> T {
let dst = cast::transmute(dst);
let val = cast::transmute(val);

cast::transmute(match order {
Acquire => intrinsics::atomic_min_acq(dst, val),
Release => intrinsics::atomic_min_rel(dst, val),
AcqRel => intrinsics::atomic_min_acqrel(dst, val),
Relaxed => intrinsics::atomic_min_relaxed(dst, val),
_ => intrinsics::atomic_min(dst, val)
})
}

#[inline]
pub unsafe fn atomic_umax<T>(dst: &mut T, val: T, order: Ordering) -> T {
let dst = cast::transmute(dst);
let val = cast::transmute(val);

cast::transmute(match order {
Acquire => intrinsics::atomic_umax_acq(dst, val),
Release => intrinsics::atomic_umax_rel(dst, val),
AcqRel => intrinsics::atomic_umax_acqrel(dst, val),
Relaxed => intrinsics::atomic_umax_relaxed(dst, val),
_ => intrinsics::atomic_umax(dst, val)
})
}


#[inline]
pub unsafe fn atomic_umin<T>(dst: &mut T, val: T, order: Ordering) -> T {
let dst = cast::transmute(dst);
let val = cast::transmute(val);

cast::transmute(match order {
Acquire => intrinsics::atomic_umin_acq(dst, val),
Release => intrinsics::atomic_umin_rel(dst, val),
AcqRel => intrinsics::atomic_umin_acqrel(dst, val),
Relaxed => intrinsics::atomic_umin_relaxed(dst, val),
_ => intrinsics::atomic_umin(dst, val)
})
}

/**
* An atomic fence.
*
Expand Down