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

Enable Timer to set an absolute time

Browse Source
This commit is contained in:
Chen Chengjun
2024-05-31 18:22:55 +08:00
committed by Tate, Hongliang Tian
parent e952a16954
commit 13fd173b24
4 changed files with 44 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/aster-nix/src/time/core/timer.rs
View File

@ -15,6 +15,14 @@ use aster_frame::sync::SpinLock;
use super::Clock;
/// A timeout, represented in one of the two ways.
pub enum Timeout {
/// The timeout is reached _after_ the `Duration` time is elapsed.
After(Duration),
/// The timeout is reached _when_ the clock's time is equal to `Duration`.
When(Duration),
}
/// A timer with periodic functionality.
///
/// Setting the timer will trigger a callback function upon expiration of
@ -65,9 +73,15 @@ impl Timer {
/// The registered callback function of this timer will be invoked
/// when reaching timeout. If the timer has a valid interval, this timer
/// will be set again with the interval when reaching timeout.
pub fn set_timeout(self: &Arc<Self>, timeout: Duration) {
let now = self.timer_manager.clock.read_time();
let expired_time = now + timeout;
pub fn set_timeout(self: &Arc<Self>, timeout: Timeout) {
let expired_time = match timeout {
Timeout::After(timeout) => {
let now = self.timer_manager.clock.read_time();
now + timeout
}
Timeout::When(timeout) => timeout,
};
let timer_weak = Arc::downgrade(self);
let new_timer_callback = Arc::new(TimerCallback::new(
expired_time,
@ -107,6 +121,11 @@ impl Timer {
pub fn timer_manager(&self) -> &Arc<TimerManager> {
&self.timer_manager
}
/// Returns the interval time of the current timer.
pub fn interval(&self) -> Duration {
*self.interval.lock_irq_disabled()
}
}
fn interval_timer_callback(timer: &Weak<Timer>) {
@ -117,7 +136,7 @@ fn interval_timer_callback(timer: &Weak<Timer>) {
(timer.registered_callback)();
let interval = timer.interval.lock_irq_disabled();
if *interval != Duration::ZERO {
timer.set_timeout(*interval);
timer.set_timeout(Timeout::After(*interval));
}
}

4
kernel/aster-nix/src/time/wait.rs
View File

@ -4,7 +4,7 @@ use core::time::Duration;
use aster_frame::sync::{WaitQueue, Waiter};
use super::clocks::JIFFIES_TIMER_MANAGER;
use super::{clocks::JIFFIES_TIMER_MANAGER, timer::Timeout};
/// A trait that provide the timeout related function for [`WaitQueue`]`.
pub trait WaitTimeout {
@ -34,7 +34,7 @@ impl WaitTimeout for WaitQueue {
let jiffies_timer = JIFFIES_TIMER_MANAGER.get().unwrap().create_timer(move || {
waker.wake_up();
});
jiffies_timer.set_timeout(*timeout);
jiffies_timer.set_timeout(Timeout::After(*timeout));
let cancel_cond = {
let jiffies_timer = jiffies_timer.clone();