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

Add TFDSetTimeFlags and fix reachable panic

Browse Source
This commit is contained in:
Marsman1996
2025-06-09 16:57:53 +08:00
committed by Chengjun Chen
parent 0b471ef370
commit 9109741e8b
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
kernel/src/syscall/timerfd_settime.rs
View File

@ -6,7 +6,12 @@ use super::SyscallReturn;
use crate::{ use crate::{
fs::file_table::FileDesc, fs::file_table::FileDesc,
prelude::*, prelude::*,
time::{itimerspec_t, timer::Timeout, timerfd::TimerfdFile, timespec_t, TIMER_ABSTIME}, time::{
itimerspec_t,
timer::Timeout,
timerfd::{TFDSetTimeFlags, TimerfdFile},
timespec_t,
},
}; };
pub fn sys_timerfd_settime( pub fn sys_timerfd_settime(
@ -16,6 +21,8 @@ pub fn sys_timerfd_settime(
old_itimerspec_addr: Vaddr, old_itimerspec_addr: Vaddr,
ctx: &Context, ctx: &Context,
) -> Result<SyscallReturn> { ) -> Result<SyscallReturn> {
let flags = TFDSetTimeFlags::from_bits(flags as u32)
.ok_or_else(|| Error::with_message(Errno::EINVAL, "invalid flags for timerfd_settime"))?;
let file_table = ctx.thread_local.borrow_file_table(); let file_table = ctx.thread_local.borrow_file_table();
let file_table_locked = file_table.unwrap().read(); let file_table_locked = file_table.unwrap().read();
let timerfd_file = file_table_locked.get_file(fd as _)?; let timerfd_file = file_table_locked.get_file(fd as _)?;
@ -45,16 +52,15 @@ pub fn sys_timerfd_settime(
// when the timer is rearmed. // when the timer is rearmed.
timerfd_file.clear_ticks(); timerfd_file.clear_ticks();
const TFD_TIMER_CANCEL_ON_SET: i32 = 2;
if expire_time != Duration::ZERO { if expire_time != Duration::ZERO {
let timeout = if flags == 0 { if flags.contains(TFDSetTimeFlags::TFD_TIMER_CANCEL_ON_SET) {
Timeout::After(expire_time)
} else if flags == TIMER_ABSTIME {
Timeout::When(expire_time)
} else if flags == TFD_TIMER_CANCEL_ON_SET {
unimplemented!() unimplemented!()
}
let timeout = if flags.contains(TFDSetTimeFlags::TFD_TIMER_ABSTIME) {
Timeout::When(expire_time)
} else { } else {
unreachable!() Timeout::After(expire_time)
}; };
timer.set_timeout(timeout); timer.set_timeout(timeout);
} }

10
kernel/src/time/timerfd.rs
View File

@ -27,13 +27,21 @@ pub struct TimerfdFile {
} }
bitflags! { bitflags! {
/// The flags useds for timerfd-related operations. /// The flags used for timerfd-related operations.
pub struct TFDFlags: u32 { pub struct TFDFlags: u32 {
const TFD_CLOEXEC = CreationFlags::O_CLOEXEC.bits(); const TFD_CLOEXEC = CreationFlags::O_CLOEXEC.bits();
const TFD_NONBLOCK = StatusFlags::O_NONBLOCK.bits(); const TFD_NONBLOCK = StatusFlags::O_NONBLOCK.bits();
} }
} }
bitflags! {
/// The flags used for timerfd settime operations.
pub struct TFDSetTimeFlags: u32 {
const TFD_TIMER_ABSTIME = 0x1;
const TFD_TIMER_CANCEL_ON_SET = 0x2;
}
}
impl TimerfdFile { impl TimerfdFile {
/// Creates a new `TimerfdFile` instance. /// Creates a new `TimerfdFile` instance.
pub fn new(clockid: clockid_t, flags: TFDFlags, ctx: &Context) -> Result<Self> { pub fn new(clockid: clockid_t, flags: TFDFlags, ctx: &Context) -> Result<Self> {