Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-26 19:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve readability

Browse Source
This commit is contained in:
Marsman1996
2024-08-21 23:02:16 +08:00
committed by Tate, Hongliang Tian
parent 95aaef9aa1
commit 90688286aa
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kernel/aster-nix/src/process/process/timer_manager.rs
View File

@ -188,25 +188,25 @@ impl PosixTimerManager {
/// Finds a POSIX timer by the input `timer_id`. /// Finds a POSIX timer by the input `timer_id`.
pub fn find_posix_timer(&self, timer_id: usize) -> Option<Arc<Timer>> { pub fn find_posix_timer(&self, timer_id: usize) -> Option<Arc<Timer>> {
let timers = self.posix_timers.lock(); let timers = self.posix_timers.lock();
if timer_id < timers.len() { if timer_id >= timers.len() {
timers[timer_id].clone() return None;
} else {
None
} }
timers[timer_id].clone()
} }
/// Removes the POSIX timer with the ID `timer_id`. /// Removes the POSIX timer with the ID `timer_id`.
pub fn remove_posix_timer(&self, timer_id: usize) -> Option<Arc<Timer>> { pub fn remove_posix_timer(&self, timer_id: usize) -> Option<Arc<Timer>> {
let mut timers = self.posix_timers.lock(); let mut timers = self.posix_timers.lock();
if timer_id < timers.len() { if timer_id >= timers.len() {
let timer = timers[timer_id].take(); return None;
if timer.is_some() {
// Holding the lock of `posix_timers` is required to operate the `id_allocator`.
self.id_allocator.lock().free(timer_id);
}
timer
} else {
None
} }
let timer = timers[timer_id].take();
if timer.is_some() {
// Holding the lock of `posix_timers` is required to operate the `id_allocator`.
self.id_allocator.lock().free(timer_id);
}
timer
} }
} }