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

Rename Poller to PollHandle

Browse Source
This commit is contained in:
Ruihan Li
2024-10-24 17:45:47 +08:00
committed by Tate, Hongliang Tian
parent 44b55f2ccf
commit f12e502ab0
35 changed files with 85 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/syscall/eventfd.rs
View File

@ -26,7 +26,7 @@ use crate::{
},
prelude::*,
process::{
signal::{Pollable, Pollee, Poller},
signal::{PollHandle, Pollable, Pollee},
Gid, Uid,
},
time::clocks::RealTimeClock,
@ -174,7 +174,7 @@ impl EventFile {
}
impl Pollable for EventFile {
fn poll(&self, mask: IoEvents, poller: Option<&mut Poller>) -> IoEvents {
fn poll(&self, mask: IoEvents, poller: Option<&mut PollHandle>) -> IoEvents {
self.pollee.poll(mask, poller)
}
}

6
kernel/src/syscall/poll.rs
View File

@ -7,7 +7,7 @@ use crate::{
events::IoEvents,
fs::{file_handle::FileLike, file_table::FileDesc},
prelude::*,
process::signal::Poller,
process::signal::PollHandle,
};
pub fn sys_poll(fds: Vaddr, nfds: u64, timeout: i32, ctx: &Context) -> Result<SyscallReturn> {
@ -126,13 +126,13 @@ fn hold_files(poll_fds: &[PollFd], ctx: &Context) -> (FileResult, Vec<Option<Arc
}
enum PollerResult {
AllRegistered(Poller),
AllRegistered(PollHandle),
EventFoundAt(usize),
}
/// Registers the files with a poller, or exits early if some events are detected.
fn register_poller(poll_fds: &[PollFd], files: &[Option<Arc<dyn FileLike>>]) -> PollerResult {
let mut poller = Poller::new();
let mut poller = PollHandle::new();
for (i, (poll_fd, file)) in poll_fds.iter().zip(files.iter()).enumerate() {
let Some(file) = file else {