Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-08 21:06:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve FIXME in pipe tests

Browse Source
This commit is contained in:
Ruihan Li 2025-01-19 08:47:53 +09:00 committed by Tate, Hongliang Tian
parent 2cf4aebe7a
commit b472737771
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel/src/fs/pipe.rs
View File

@ -211,8 +211,8 @@ mod test {
fn test_blocking<W, R>(write: W, read: R, ordering: Ordering)
where
W: Fn(Arc<PipeWriter>) + Sync + Send + 'static,
R: Fn(Arc<PipeReader>) + Sync + Send + 'static,
W: FnOnce(Arc<PipeWriter>) + Send + 'static,
R: FnOnce(Arc<PipeReader>) + Send + 'static,
{
let channel = Channel::with_capacity(2);
let (writer, readr) = channel.split();
@ -220,18 +220,10 @@ mod test {
let writer = PipeWriter::new(writer, StatusFlags::empty()).unwrap();
let reader = PipeReader::new(readr, StatusFlags::empty()).unwrap();
// FIXME: `ThreadOptions::new` currently accepts `Fn`, forcing us to use `SpinLock` to gain
// internal mutability. We should avoid this `SpinLock` by making `ThreadOptions::new`
// accept `FnOnce`.
let writer_with_lock: SpinLock<_> = SpinLock::new(Some(writer));
let reader_with_lock: SpinLock<_> = SpinLock::new(Some(reader));
let signal_writer = Arc::new(AtomicBool::new(false));
let signal_reader = signal_writer.clone();
let writer = ThreadOptions::new(move || {
let writer = writer_with_lock.lock().take().unwrap();
if ordering == Ordering::ReadThenWrite {
while !signal_writer.load(atomic::Ordering::Relaxed) {
Thread::yield_now();
@ -245,8 +237,6 @@ mod test {
.spawn();
let reader = ThreadOptions::new(move || {
let reader = reader_with_lock.lock().take().unwrap();
if ordering == Ordering::WriteThenRead {
while !signal_reader.load(atomic::Ordering::Relaxed) {
Thread::yield_now();