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

Use read-write lock for the irq callback list

Browse Source
This commit is contained in:
Zhang Junyang 2024-10-24 10:54:29 +08:00 committed by Tate, Hongliang Tian
parent 4658b62f90
commit fe8e451c4f
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ostd/src/arch/x86/irq.rs
View File

@ -11,7 +11,7 @@ use spin::Once;
use x86_64::registers::rflags::{self, RFlags}; use x86_64::registers::rflags::{self, RFlags};
use crate::{ use crate::{
sync::{Mutex, PreemptDisabled, SpinLock, SpinLockGuard}, sync::{Mutex, RwLock, RwLockReadGuard, SpinLock},
trap::TrapFrame, trap::TrapFrame,
}; };
@ -25,7 +25,7 @@ pub(crate) fn init() {
for i in 0..256 { for i in 0..256 {
list.push(IrqLine { list.push(IrqLine {
irq_num: i as u8, irq_num: i as u8,
callback_list: SpinLock::new(Vec::new()), callback_list: RwLock::new(Vec::new()),
}); });
} }
IRQ_LIST.call_once(|| list); IRQ_LIST.call_once(|| list);
@ -84,7 +84,7 @@ impl Debug for CallbackElement {
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct IrqLine { pub(crate) struct IrqLine {
pub(crate) irq_num: u8, pub(crate) irq_num: u8,
pub(crate) callback_list: SpinLock<Vec<CallbackElement>>, pub(crate) callback_list: RwLock<Vec<CallbackElement>>,
} }
impl IrqLine { impl IrqLine {
@ -104,10 +104,8 @@ impl IrqLine {
self.irq_num self.irq_num
} }
pub fn callback_list( pub fn callback_list(&self) -> RwLockReadGuard<alloc::vec::Vec<CallbackElement>> {
&self, self.callback_list.read()
) -> SpinLockGuard<alloc::vec::Vec<CallbackElement>, PreemptDisabled> {
self.callback_list.lock()
} }
/// Registers a callback that will be invoked when the IRQ is active. /// Registers a callback that will be invoked when the IRQ is active.
@ -121,7 +119,7 @@ impl IrqLine {
F: Fn(&TrapFrame) + Sync + Send + 'static, F: Fn(&TrapFrame) + Sync + Send + 'static,
{ {
let allocated_id = CALLBACK_ID_ALLOCATOR.get().unwrap().lock().alloc().unwrap(); let allocated_id = CALLBACK_ID_ALLOCATOR.get().unwrap().lock().alloc().unwrap();
self.callback_list.lock().push(CallbackElement { self.callback_list.write().push(CallbackElement {
function: Box::new(callback), function: Box::new(callback),
id: allocated_id, id: allocated_id,
}); });
@ -150,7 +148,7 @@ impl Drop for IrqCallbackHandle {
.get(self.irq_num as usize) .get(self.irq_num as usize)
.unwrap() .unwrap()
.callback_list .callback_list
.lock(); .write();
a.retain(|item| item.id != self.id); a.retain(|item| item.id != self.id);
CALLBACK_ID_ALLOCATOR.get().unwrap().lock().free(self.id); CALLBACK_ID_ALLOCATOR.get().unwrap().lock().free(self.id);
} }