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

Use new SpinLock APIs in wait.rs

Browse Source
This commit is contained in:
Ruihan Li
2024-11-07 22:57:03 +08:00
committed by Tate, Hongliang Tian
parent 1f612e45f7
commit 11382524d1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ostd/src/sync/wait.rs
View File

@ -3,7 +3,7 @@
use alloc::{collections::VecDeque, sync::Arc}; use alloc::{collections::VecDeque, sync::Arc};
use core::sync::atomic::{AtomicBool, AtomicU32, Ordering}; use core::sync::atomic::{AtomicBool, AtomicU32, Ordering};
use super::SpinLock; use super::{LocalIrqDisabled, SpinLock};
use crate::task::{scheduler, Task}; use crate::task::{scheduler, Task};
// # Explanation on the memory orders // # Explanation on the memory orders
@ -43,7 +43,7 @@ use crate::task::{scheduler, Task};
pub struct WaitQueue { pub struct WaitQueue {
// A copy of `wakers.len()`, used for the lock-free fast path in `wake_one` and `wake_all`. // A copy of `wakers.len()`, used for the lock-free fast path in `wake_one` and `wake_all`.
num_wakers: AtomicU32, num_wakers: AtomicU32,
wakers: SpinLock<VecDeque<Arc<Waker>>>, wakers: SpinLock<VecDeque<Arc<Waker>>, LocalIrqDisabled>,
} }
impl WaitQueue { impl WaitQueue {
@ -92,7 +92,7 @@ impl WaitQueue {
} }
loop { loop {
let mut wakers = self.wakers.disable_irq().lock(); let mut wakers = self.wakers.lock();
let Some(waker) = wakers.pop_front() else { let Some(waker) = wakers.pop_front() else {
return false; return false;
}; };
@ -116,7 +116,7 @@ impl WaitQueue {
let mut num_woken = 0; let mut num_woken = 0;
loop { loop {
let mut wakers = self.wakers.disable_irq().lock(); let mut wakers = self.wakers.lock();
let Some(waker) = wakers.pop_front() else { let Some(waker) = wakers.pop_front() else {
break; break;
}; };
@ -142,7 +142,7 @@ impl WaitQueue {
/// Enqueues the input [`Waker`] to the wait queue. /// Enqueues the input [`Waker`] to the wait queue.
#[doc(hidden)] #[doc(hidden)]
pub fn enqueue(&self, waker: Arc<Waker>) { pub fn enqueue(&self, waker: Arc<Waker>) {
let mut wakers = self.wakers.disable_irq().lock(); let mut wakers = self.wakers.lock();
wakers.push_back(waker); wakers.push_back(waker);
self.num_wakers.fetch_add(1, Ordering::Acquire); self.num_wakers.fetch_add(1, Ordering::Acquire);
} }