Skip to content

Commit

Permalink
Use simple spinlock in AtomicU64
Browse files Browse the repository at this point in the history
  • Loading branch information
taiki-e committed Nov 1, 2019
1 parent b4b1024 commit d84d7cc
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 14 deletions.
71 changes: 62 additions & 9 deletions src/sync/atomic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,33 +11,86 @@ mod imp {

#[cfg(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc"))]
mod imp {
use std::sync::atomic::Ordering;
use std::sync::Mutex;
use std::cell::UnsafeCell;
use std::ops::{Deref, DerefMut};
use std::sync::atomic::{AtomicBool, Ordering};

#[derive(Debug)]
pub(crate) struct AtomicU64(Mutex<u64>);
use crossbeam_utils::Backoff;

pub(crate) struct AtomicU64(Spinlock<u64>);

impl AtomicU64 {
pub(crate) fn new(val: u64) -> Self {
Self(Mutex::new(val))
pub(crate) const fn new(val: u64) -> Self {
Self(Spinlock::new(val))
}

pub(crate) fn load(&self, _: Ordering) -> u64 {
*self.0.lock().unwrap()
*self.0.lock()
}

pub(crate) fn fetch_add(&self, val: u64, _: Ordering) -> u64 {
let mut lock = self.0.lock().unwrap();
let mut lock = self.0.lock();
let prev = *lock;
*lock = prev + val;
prev
}

pub(crate) fn fetch_sub(&self, val: u64, _: Ordering) -> u64 {
let mut lock = self.0.lock().unwrap();
let mut lock = self.0.lock();
let prev = *lock;
*lock = prev - val;
prev
}
}

/// A simple spinlock.
struct Spinlock<T> {
flag: AtomicBool,
value: UnsafeCell<T>,
}

unsafe impl<T: Send> Send for Spinlock<T> {}
unsafe impl<T: Send> Sync for Spinlock<T> {}

impl<T> Spinlock<T> {
/// Returns a new spinlock initialized with `value`.
const fn new(value: T) -> Self {
Self {
flag: AtomicBool::new(false),
value: UnsafeCell::new(value),
}
}

/// Locks the spinlock.
fn lock(&self) -> SpinlockGuard<'_, T> {
let backoff = Backoff::new();
while self.flag.swap(true, Ordering::Acquire) {
backoff.snooze();
}
SpinlockGuard(self)
}
}

/// A guard holding a spinlock locked.
struct SpinlockGuard<'a, T>(&'a Spinlock<T>);

impl<T> Drop for SpinlockGuard<'_, T> {
fn drop(&mut self) {
self.0.flag.store(false, Ordering::Release);
}
}

impl<T> Deref for SpinlockGuard<'_, T> {
type Target = T;

fn deref(&self) -> &T {
unsafe { &*self.0.value.get() }
}
}

impl<T> DerefMut for SpinlockGuard<'_, T> {
fn deref_mut(&mut self) -> &mut T {
unsafe { &mut *self.0.value.get() }
}
}
}
5 changes: 0 additions & 5 deletions src/task/spawn_blocking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,6 @@ where

const MAX_THREADS: u64 = 10_000;

#[cfg(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc"))]
lazy_static! {
static ref DYNAMIC_THREAD_COUNT: AtomicU64 = AtomicU64::new(0);
}
#[cfg(not(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc")))]
static DYNAMIC_THREAD_COUNT: AtomicU64 = AtomicU64::new(0);

struct Pool {
Expand Down

0 comments on commit d84d7cc

Please sign in to comment.