Files
RedBear-OS/src/sync/barrier.rs
T
4lDO2 79dfddf82c Switch to a boring mutex+condvar based barrier.
While the atomic version might be better, at the moment the priority is
to just to get RLCT working reliably.
2023-05-06 17:02:53 +02:00

85 lines
2.0 KiB
Rust

use core::cmp;
use core::num::NonZeroU32;
use core::sync::atomic::{AtomicU32 as AtomicUint, Ordering};
pub struct Barrier {
original_count: NonZeroU32,
// 4
lock: crate::sync::Mutex<Inner>,
// 16
cvar: crate::header::pthread::RlctCond,
// 24
}
#[derive(Debug)]
struct Inner {
count: u32,
// TODO: Overflows might be problematic... 64-bit?
gen_id: u32,
}
pub enum WaitResult {
Waited,
NotifiedAll,
}
impl Barrier {
pub fn new(count: NonZeroU32) -> Self {
Self {
original_count: count,
lock: crate::sync::Mutex::new(Inner { count: 0, gen_id: 0 }),
cvar: crate::header::pthread::RlctCond::new(),
}
}
pub fn wait(&self) -> WaitResult {
let mut guard = self.lock.lock();
let gen_id = guard.gen_id;
guard.count += 1;
if guard.count == self.original_count.get() {
guard.gen_id = guard.gen_id.wrapping_add(1);
guard.count = 0;
self.cvar.broadcast();
drop(guard);
WaitResult::NotifiedAll
} else {
while guard.gen_id == gen_id {
guard = self.cvar.wait_inner_typedmutex(guard);
}
WaitResult::Waited
}
/*
let mut guard = self.lock.lock();
let Inner { count, gen_id } = *guard;
let last = self.original_count.get() - 1;
if count == last {
eprintln!("last {:?}", *guard);
guard.gen_id = guard.gen_id.wrapping_add(1);
guard.count = 0;
drop(guard);
self.cvar.broadcast();
WaitResult::NotifiedAll
} else {
guard.count += 1;
while guard.count != last && guard.gen_id == gen_id {
eprintln!("before {:?}", *guard);
guard = self.cvar.wait_inner_typedmutex(guard);
eprintln!("after {:?}", *guard);
}
WaitResult::Waited
}
*/
}
}
static LOCK: crate::sync::Mutex<()> = crate::sync::Mutex::new(());