refactor: axpoll

Author: AsakuraMizu

Cargo.lock

@@ -44,8 +44,9 @@ axtask = { path = "arceos/modules/axtask", features = ["task-ext"] }
 
 axbacktrace = "0.1"
 axerrno = "0.1"
-axfs-ng-vfs = { git = "https://github.com/Starry-OS/axfs-ng-vfs.git", rev = "e3e83d6" }
+axfs-ng-vfs = "0.1"
 axio = "0.1"
+axpoll = "0.1"
 starry-process = "0.2"
 starry-signal = "0.2"
 starry-vm = "0.1"
@@ -146,11 +147,13 @@ optional = true
 axbacktrace = { git = "https://github.com/Starry-OS/axbacktrace.git", rev = "09c22b6" }
 axcpu = { git = "https://github.com/Starry-OS/axcpu.git", rev = "53455db" }
 axerrno = { git = "https://github.com/Starry-OS/axerrno.git", rev = "58be232" }
-axio = { git = "https://github.com/Starry-OS/axio.git", rev = "f7a2dfe" }
+axfs-ng-vfs = { git = "https://github.com/Starry-OS/axfs-ng-vfs.git", rev = "6cf8893" }
+axio = { git = "https://github.com/Starry-OS/axio.git", rev = "ebb0c6b" }
 axplat = { git = "https://github.com/Starry-OS/axplat_crates.git", rev = "243fdc9" }
 axplat-aarch64-qemu-virt = { git = "https://github.com/Starry-OS/axplat_crates.git", rev = "243fdc9" }
 axplat-riscv64-qemu-virt = { git = "https://github.com/Starry-OS/axplat_crates.git", rev = "243fdc9" }
 axplat-loongarch64-qemu-virt = { git = "https://github.com/Starry-OS/axplat_crates.git", rev = "243fdc9" }
+axpoll = { git = "https://github.com/Starry-OS/axpoll.git", rev = "258cb5f" }
 page_table_entry = { git = "https://github.com/Starry-OS/page_table_multiarch.git", rev = "3f697c8" }
 page_table_multiarch = { git = "https://github.com/Starry-OS/page_table_multiarch.git", rev = "3f697c8" }
 starry-process = { git = "https://github.com/Starry-OS/starry-process.git", rev = "6327455" }

Cargo.toml

@@ -28,6 +28,7 @@ axmm.workspace = true
 axnet.workspace = true
 axsync.workspace = true
 axtask.workspace = true
+axpoll.workspace = true
 
 starry-core.workspace = true
 

api/Cargo.toml

@@ -12,7 +12,7 @@ use core::{
 };
 
 use axerrno::{AxError, AxResult};
-use axio::{IoEvents, PollSet, Pollable};
+use axpoll::{IoEvents, PollSet, Pollable};
 use bitflags::bitflags;
 use hashbrown::HashMap;
 use kspin::SpinNoPreempt;
@@ -222,7 +222,7 @@ impl Epoll {
             let (event, still_ready) = interest.poll(file.as_ref());
             if let Some(event) = event {
                 *slot = epoll_event {
-                    events: event.events.bits() as u32,
+                    events: event.events.bits(),
                     data: event.user_data,
                 };
                 result += 1;

api/src/file/epoll.rs

@@ -6,7 +6,8 @@ use core::{
 };
 
 use axerrno::AxError;
-use axio::{Buf, BufMut, IoEvents, PollSet, Pollable, Read, Write};
+use axio::{Buf, BufMut, Read, Write};
+use axpoll::{IoEvents, PollSet, Pollable};
 use axtask::future::Poller;
 
 use crate::file::{FileLike, Kstat, SealedBuf, SealedBufMut};

api/src/file/event.rs

@@ -10,18 +10,15 @@ use core::{
 use axerrno::{AxError, AxResult};
 use axfs_ng::{FS_CONTEXT, FsContext};
 use axfs_ng_vfs::{Location, Metadata, NodeFlags};
-use axio::{IoEvents, Pollable};
+use axpoll::{IoEvents, Pollable};
 use axsync::Mutex;
 use axtask::future::Poller;
 use linux_raw_sys::general::{AT_EMPTY_PATH, AT_FDCWD, AT_SYMLINK_NOFOLLOW};
 
 use super::{FileLike, Kstat, get_file_like};
 use crate::file::{SealedBuf, SealedBufMut};
 
-pub fn with_fs<R>(
-    dirfd: c_int,
-    f: impl FnOnce(&mut FsContext) -> AxResult<R>,
-) -> AxResult<R> {
+pub fn with_fs<R>(dirfd: c_int, f: impl FnOnce(&mut FsContext) -> AxResult<R>) -> AxResult<R> {
     let mut fs = FS_CONTEXT.lock();
     if dirfd == AT_FDCWD {
         f(&mut fs)

api/src/file/fs.rs

@@ -11,7 +11,8 @@ use core::{any::Any, ffi::c_int, time::Duration};
 use axerrno::{AxError, AxResult};
 use axfs_ng::{FS_CONTEXT, OpenOptions};
 use axfs_ng_vfs::DeviceId;
-use axio::{Buf, BufMut, Pollable, Read, Write};
+use axio::{Buf, BufMut, Read, Write};
+use axpoll::Pollable;
 use axtask::current;
 use flatten_objects::FlattenObjects;
 use inherit_methods_macro::inherit_methods;

api/src/file/mod.rs

@@ -2,11 +2,11 @@ use alloc::{borrow::Cow, format, sync::Arc};
 use core::{ffi::c_int, ops::Deref, task::Context};
 
 use axerrno::{AxError, AxResult};
-use axio::{IoEvents, Pollable};
 use axnet::{
     SocketOps,
     options::{Configurable, GetSocketOption, SetSocketOption},
 };
+use axpoll::{IoEvents, Pollable};
 use linux_raw_sys::general::S_IFSOCK;
 
 use super::{FileLike, Kstat};

api/src/file/net.rs

@@ -5,7 +5,7 @@ use alloc::{
 use core::task::Context;
 
 use axerrno::{AxError, AxResult};
-use axio::{IoEvents, PollSet, Pollable};
+use axpoll::{IoEvents, PollSet, Pollable};
 use starry_core::task::ProcessData;
 
 use crate::file::{FileLike, Kstat, SealedBuf, SealedBufMut};

api/src/file/pidfd.rs

@@ -7,7 +7,8 @@ use core::{
 };
 
 use axerrno::{AxError, AxResult};
-use axio::{Buf, BufMut, IoEvents, PollSet, Pollable, Read, Write};
+use axio::{Buf, BufMut, Read, Write};
+use axpoll::{IoEvents, PollSet, Pollable};
 use axsync::Mutex;
 use axtask::{current, future::Poller};
 use linux_raw_sys::{general::S_IFIFO, ioctl::FIONREAD};