diff --git a/kernel/aster-nix/src/fs/epoll/epoll_file.rs b/kernel/aster-nix/src/fs/epoll/epoll_file.rs index a128e91cf..4a40a30ff 100644 --- a/kernel/aster-nix/src/fs/epoll/epoll_file.rs +++ b/kernel/aster-nix/src/fs/epoll/epoll_file.rs @@ -26,7 +26,7 @@ use crate::{ /// event happens on the file. pub struct EpollFile { // All interesting entries. - interest: Mutex>>, + interest: Mutex>>, // Entries that are probably ready (having events happened). ready: Mutex>>, // EpollFile itself is also pollable @@ -59,12 +59,7 @@ impl EpollFile { } } - fn add_interest( - &self, - fd: FileDescripter, - ep_event: EpollEvent, - ep_flags: EpollFlags, - ) -> Result<()> { + fn add_interest(&self, fd: FileDesc, ep_event: EpollEvent, ep_flags: EpollFlags) -> Result<()> { self.warn_unsupported_flags(&ep_flags); let current = current!(); @@ -96,7 +91,7 @@ impl EpollFile { Ok(()) } - fn del_interest(&self, fd: FileDescripter) -> Result<()> { + fn del_interest(&self, fd: FileDesc) -> Result<()> { let mut interest = self.interest.lock(); let entry = interest .remove(&fd) @@ -123,7 +118,7 @@ impl EpollFile { fn mod_interest( &self, - fd: FileDescripter, + fd: FileDesc, new_ep_event: EpollEvent, new_ep_flags: EpollFlags, ) -> Result<()> { @@ -154,7 +149,7 @@ impl EpollFile { Ok(()) } - fn unregister_from_file_table_entry(&self, fd: FileDescripter) { + fn unregister_from_file_table_entry(&self, fd: FileDesc) { let current = current!(); let file_table = current.file_table().lock(); if let Ok(entry) = file_table.get_entry(fd) { @@ -361,7 +356,7 @@ impl FileLike for EpollFile { /// An epoll entry contained in an epoll file. Each epoll entry is added, modified, /// or deleted by the `EpollCtl` command. pub struct EpollEntry { - fd: FileDescripter, + fd: FileDesc, file: Weak, inner: Mutex, // Whether the entry is in the ready list @@ -382,7 +377,7 @@ struct Inner { impl EpollEntry { /// Creates a new epoll entry associated with the given epoll file. pub fn new( - fd: FileDescripter, + fd: FileDesc, file: Weak, event: EpollEvent, flags: EpollFlags, @@ -482,7 +477,7 @@ impl EpollEntry { } /// Get the file descriptor associated with the epoll entry. - pub fn fd(&self) -> FileDescripter { + pub fn fd(&self) -> FileDesc { self.fd } } diff --git a/kernel/aster-nix/src/fs/epoll/mod.rs b/kernel/aster-nix/src/fs/epoll/mod.rs index a4aae4b00..208a5fdff 100644 --- a/kernel/aster-nix/src/fs/epoll/mod.rs +++ b/kernel/aster-nix/src/fs/epoll/mod.rs @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MPL-2.0 -use super::file_table::FileDescripter; +use super::file_table::FileDesc; use crate::{events::IoEvents, prelude::*}; mod epoll_file; @@ -10,9 +10,9 @@ pub use self::epoll_file::EpollFile; /// An epoll control command. #[derive(Copy, Clone, Debug, PartialEq)] pub enum EpollCtl { - Add(FileDescripter, EpollEvent, EpollFlags), - Del(FileDescripter), - Mod(FileDescripter, EpollEvent, EpollFlags), + Add(FileDesc, EpollEvent, EpollFlags), + Del(FileDesc), + Mod(FileDesc, EpollEvent, EpollFlags), } bitflags! { diff --git a/kernel/aster-nix/src/fs/file_table.rs b/kernel/aster-nix/src/fs/file_table.rs index 1304f6f52..2ef73be98 100644 --- a/kernel/aster-nix/src/fs/file_table.rs +++ b/kernel/aster-nix/src/fs/file_table.rs @@ -15,7 +15,7 @@ use crate::{ prelude::*, }; -pub type FileDescripter = i32; +pub type FileDesc = i32; pub struct FileTable { table: SlotVec, @@ -58,12 +58,7 @@ impl FileTable { } } - pub fn dup( - &mut self, - fd: FileDescripter, - new_fd: FileDescripter, - flags: FdFlags, - ) -> Result { + pub fn dup(&mut self, fd: FileDesc, new_fd: FileDesc, flags: FdFlags) -> Result { let file = self .table .get(fd as usize) @@ -88,17 +83,17 @@ impl FileTable { let min_free_fd = get_min_free_fd(); let entry = FileTableEntry::new(file, flags); self.table.put_at(min_free_fd, entry); - Ok(min_free_fd as FileDescripter) + Ok(min_free_fd as FileDesc) } - pub fn insert(&mut self, item: Arc, flags: FdFlags) -> FileDescripter { + pub fn insert(&mut self, item: Arc, flags: FdFlags) -> FileDesc { let entry = FileTableEntry::new(item, flags); - self.table.put(entry) as FileDescripter + self.table.put(entry) as FileDesc } pub fn insert_at( &mut self, - fd: FileDescripter, + fd: FileDesc, item: Arc, flags: FdFlags, ) -> Option> { @@ -112,7 +107,7 @@ impl FileTable { entry.map(|e| e.file) } - pub fn close_file(&mut self, fd: FileDescripter) -> Option> { + pub fn close_file(&mut self, fd: FileDesc) -> Option> { let entry = self.table.remove(fd as usize); if entry.is_some() { let events = FdEvents::Close(fd); @@ -124,10 +119,10 @@ impl FileTable { pub fn close_all(&mut self) -> Vec> { let mut closed_files = Vec::new(); - let closed_fds: Vec = self + let closed_fds: Vec = self .table .idxes_and_items() - .map(|(idx, _)| idx as FileDescripter) + .map(|(idx, _)| idx as FileDesc) .collect(); for fd in closed_fds { let entry = self.table.remove(fd as usize).unwrap(); @@ -141,12 +136,12 @@ impl FileTable { pub fn close_files_on_exec(&mut self) -> Vec> { let mut closed_files = Vec::new(); - let closed_fds: Vec = self + let closed_fds: Vec = self .table .idxes_and_items() .filter_map(|(idx, entry)| { if entry.flags().contains(FdFlags::CLOEXEC) { - Some(idx as FileDescripter) + Some(idx as FileDesc) } else { None } @@ -162,30 +157,30 @@ impl FileTable { closed_files } - pub fn get_file(&self, fd: FileDescripter) -> Result<&Arc> { + pub fn get_file(&self, fd: FileDesc) -> Result<&Arc> { self.table .get(fd as usize) .map(|entry| &entry.file) .ok_or(Error::with_message(Errno::EBADF, "fd not exits")) } - pub fn get_socket(&self, sockfd: FileDescripter) -> Result> { + pub fn get_socket(&self, sockfd: FileDesc) -> Result> { let file_like = self.get_file(sockfd)?.clone(); file_like .as_socket() .ok_or_else(|| Error::with_message(Errno::ENOTSOCK, "the fd is not a socket")) } - pub fn get_entry(&self, fd: FileDescripter) -> Result<&FileTableEntry> { + pub fn get_entry(&self, fd: FileDesc) -> Result<&FileTableEntry> { self.table .get(fd as usize) .ok_or(Error::with_message(Errno::EBADF, "fd not exits")) } - pub fn fds_and_files(&self) -> impl Iterator)> { + pub fn fds_and_files(&self) -> impl Iterator)> { self.table .idxes_and_items() - .map(|(idx, entry)| (idx as FileDescripter, &entry.file)) + .map(|(idx, entry)| (idx as FileDesc, &entry.file)) } pub fn register_observer(&self, observer: Weak>) { @@ -219,7 +214,7 @@ impl Drop for FileTable { #[derive(Copy, Clone)] pub enum FdEvents { - Close(FileDescripter), + Close(FileDesc), DropFileTable, } diff --git a/kernel/aster-nix/src/fs/fs_resolver.rs b/kernel/aster-nix/src/fs/fs_resolver.rs index e4e5ed00c..0ff2d700e 100644 --- a/kernel/aster-nix/src/fs/fs_resolver.rs +++ b/kernel/aster-nix/src/fs/fs_resolver.rs @@ -3,7 +3,7 @@ use alloc::str; use super::{ - file_table::FileDescripter, + file_table::FileDesc, inode_handle::InodeHandle, rootfs::root_mount, utils::{ @@ -234,7 +234,7 @@ impl FsResolver { } /// Lookup dentry from the giving fd - pub fn lookup_from_fd(&self, fd: FileDescripter) -> Result> { + pub fn lookup_from_fd(&self, fd: FileDesc) -> Result> { let current = current!(); let file_table = current.file_table().lock(); let inode_handle = file_table @@ -317,7 +317,7 @@ impl FsResolver { } } -pub const AT_FDCWD: FileDescripter = -100; +pub const AT_FDCWD: FileDesc = -100; #[derive(Debug)] pub struct FsPath<'a> { @@ -333,13 +333,13 @@ enum FsPathInner<'a> { // Cwd Cwd, // path is relative to DirFd - FdRelative(FileDescripter, &'a str), + FdRelative(FileDesc, &'a str), // Fd - Fd(FileDescripter), + Fd(FileDesc), } impl<'a> FsPath<'a> { - pub fn new(dirfd: FileDescripter, path: &'a str) -> Result { + pub fn new(dirfd: FileDesc, path: &'a str) -> Result { if path.len() > PATH_MAX { return_errno_with_message!(Errno::ENAMETOOLONG, "path name too long"); } diff --git a/kernel/aster-nix/src/fs/procfs/pid/fd.rs b/kernel/aster-nix/src/fs/procfs/pid/fd.rs index aadcbd4e4..2c2315625 100644 --- a/kernel/aster-nix/src/fs/procfs/pid/fd.rs +++ b/kernel/aster-nix/src/fs/procfs/pid/fd.rs @@ -1,7 +1,7 @@ // SPDX-License-Identifier: MPL-2.0 use super::*; -use crate::fs::{file_handle::FileLike, file_table::FileDescripter, inode_handle::InodeHandle}; +use crate::fs::{file_handle::FileLike, file_table::FileDesc, inode_handle::InodeHandle}; /// Represents the inode at `/proc/[pid]/fd`. pub struct FdDirOps(Arc); @@ -36,7 +36,7 @@ impl DirOps for FdDirOps { fn lookup_child(&self, this_ptr: Weak, name: &str) -> Result> { let file = { let fd = name - .parse::() + .parse::() .map_err(|_| Error::new(Errno::ENOENT))?; let file_table = self.0.file_table().lock(); file_table diff --git a/kernel/aster-nix/src/syscall/accept.rs b/kernel/aster-nix/src/syscall/accept.rs index 17f8a3fb6..df7984725 100644 --- a/kernel/aster-nix/src/syscall/accept.rs +++ b/kernel/aster-nix/src/syscall/accept.rs @@ -2,14 +2,14 @@ use super::{SyscallReturn, SYS_ACCEPT}; use crate::{ - fs::file_table::{FdFlags, FileDescripter}, + fs::file_table::{FdFlags, FileDesc}, log_syscall_entry, prelude::*, util::net::{get_socket_from_fd, write_socket_addr_to_user}, }; pub fn sys_accept( - sockfd: FileDescripter, + sockfd: FileDesc, sockaddr_ptr: Vaddr, addrlen_ptr: Vaddr, ) -> Result { diff --git a/kernel/aster-nix/src/syscall/bind.rs b/kernel/aster-nix/src/syscall/bind.rs index c1a991961..a6ccd18a2 100644 --- a/kernel/aster-nix/src/syscall/bind.rs +++ b/kernel/aster-nix/src/syscall/bind.rs @@ -2,17 +2,13 @@ use super::{SyscallReturn, SYS_BIND}; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, util::net::{get_socket_from_fd, read_socket_addr_from_user}, }; -pub fn sys_bind( - sockfd: FileDescripter, - sockaddr_ptr: Vaddr, - addrlen: u32, -) -> Result { +pub fn sys_bind(sockfd: FileDesc, sockaddr_ptr: Vaddr, addrlen: u32) -> Result { log_syscall_entry!(SYS_BIND); let socket_addr = read_socket_addr_from_user(sockaddr_ptr, addrlen as usize)?; debug!("sockfd = {sockfd}, socket_addr = {socket_addr:?}"); diff --git a/kernel/aster-nix/src/syscall/chdir.rs b/kernel/aster-nix/src/syscall/chdir.rs index e802f072f..4f52cc403 100644 --- a/kernel/aster-nix/src/syscall/chdir.rs +++ b/kernel/aster-nix/src/syscall/chdir.rs @@ -2,10 +2,7 @@ use super::{SyscallReturn, SYS_CHDIR, SYS_FCHDIR}; use crate::{ - fs::{ - file_table::FileDescripter, fs_resolver::FsPath, inode_handle::InodeHandle, - utils::InodeType, - }, + fs::{file_table::FileDesc, fs_resolver::FsPath, inode_handle::InodeHandle, utils::InodeType}, log_syscall_entry, prelude::*, syscall::constants::MAX_FILENAME_LEN, @@ -34,7 +31,7 @@ pub fn sys_chdir(pathname_addr: Vaddr) -> Result { Ok(SyscallReturn::Return(0)) } -pub fn sys_fchdir(fd: FileDescripter) -> Result { +pub fn sys_fchdir(fd: FileDesc) -> Result { log_syscall_entry!(SYS_FCHDIR); debug!("fd = {}", fd); diff --git a/kernel/aster-nix/src/syscall/chmod.rs b/kernel/aster-nix/src/syscall/chmod.rs index 77435a509..fccbeebe5 100644 --- a/kernel/aster-nix/src/syscall/chmod.rs +++ b/kernel/aster-nix/src/syscall/chmod.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_FCHMOD, SYS_FCHMODAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, utils::{InodeMode, PATH_MAX}, }, @@ -12,7 +12,7 @@ use crate::{ util::read_cstring_from_user, }; -pub fn sys_fchmod(fd: FileDescripter, mode: u16) -> Result { +pub fn sys_fchmod(fd: FileDesc, mode: u16) -> Result { log_syscall_entry!(SYS_FCHMOD); debug!("fd = {}, mode = 0o{:o}", fd, mode); @@ -29,7 +29,7 @@ pub fn sys_chmod(path_ptr: Vaddr, mode: u16) -> Result { // Glibc handles the `flags` argument, so we just ignore it. pub fn sys_fchmodat( - dirfd: FileDescripter, + dirfd: FileDesc, path_ptr: Vaddr, mode: u16, /* flags: u32, */ diff --git a/kernel/aster-nix/src/syscall/chown.rs b/kernel/aster-nix/src/syscall/chown.rs index abeba2140..a01425bf3 100644 --- a/kernel/aster-nix/src/syscall/chown.rs +++ b/kernel/aster-nix/src/syscall/chown.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_FCHOWN, SYS_FCHOWNAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, utils::PATH_MAX, }, @@ -13,7 +13,7 @@ use crate::{ util::read_cstring_from_user, }; -pub fn sys_fchown(fd: FileDescripter, uid: i32, gid: i32) -> Result { +pub fn sys_fchown(fd: FileDesc, uid: i32, gid: i32) -> Result { log_syscall_entry!(SYS_FCHOWN); debug!("fd = {}, uid = {}, gid = {}", fd, uid, gid); @@ -50,7 +50,7 @@ pub fn sys_lchown(path_ptr: Vaddr, uid: i32, gid: i32) -> Result } pub fn sys_fchownat( - dirfd: FileDescripter, + dirfd: FileDesc, path_ptr: Vaddr, uid: i32, gid: i32, diff --git a/kernel/aster-nix/src/syscall/close.rs b/kernel/aster-nix/src/syscall/close.rs index 6ac61c537..eb71d1547 100644 --- a/kernel/aster-nix/src/syscall/close.rs +++ b/kernel/aster-nix/src/syscall/close.rs @@ -1,9 +1,9 @@ // SPDX-License-Identifier: MPL-2.0 use super::{SyscallReturn, SYS_CLOSE}; -use crate::{fs::file_table::FileDescripter, log_syscall_entry, prelude::*}; +use crate::{fs::file_table::FileDesc, log_syscall_entry, prelude::*}; -pub fn sys_close(fd: FileDescripter) -> Result { +pub fn sys_close(fd: FileDesc) -> Result { log_syscall_entry!(SYS_CLOSE); debug!("fd = {}", fd); let current = current!(); diff --git a/kernel/aster-nix/src/syscall/connect.rs b/kernel/aster-nix/src/syscall/connect.rs index c69dcfaa1..3fc1b37d6 100644 --- a/kernel/aster-nix/src/syscall/connect.rs +++ b/kernel/aster-nix/src/syscall/connect.rs @@ -2,17 +2,13 @@ use super::{SyscallReturn, SYS_CONNECT}; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, util::net::{get_socket_from_fd, read_socket_addr_from_user}, }; -pub fn sys_connect( - sockfd: FileDescripter, - sockaddr_ptr: Vaddr, - addr_len: u32, -) -> Result { +pub fn sys_connect(sockfd: FileDesc, sockaddr_ptr: Vaddr, addr_len: u32) -> Result { log_syscall_entry!(SYS_CONNECT); let socket_addr = read_socket_addr_from_user(sockaddr_ptr, addr_len as _)?; debug!("fd = {sockfd}, socket_addr = {socket_addr:?}"); diff --git a/kernel/aster-nix/src/syscall/dup.rs b/kernel/aster-nix/src/syscall/dup.rs index cfb53a88b..7a30e64ec 100644 --- a/kernel/aster-nix/src/syscall/dup.rs +++ b/kernel/aster-nix/src/syscall/dup.rs @@ -2,12 +2,12 @@ use super::{SyscallReturn, SYS_DUP, SYS_DUP2}; use crate::{ - fs::file_table::{FdFlags, FileDescripter}, + fs::file_table::{FdFlags, FileDesc}, log_syscall_entry, prelude::*, }; -pub fn sys_dup(old_fd: FileDescripter) -> Result { +pub fn sys_dup(old_fd: FileDesc) -> Result { log_syscall_entry!(SYS_DUP); debug!("old_fd = {}", old_fd); @@ -19,7 +19,7 @@ pub fn sys_dup(old_fd: FileDescripter) -> Result { Ok(SyscallReturn::Return(new_fd as _)) } -pub fn sys_dup2(old_fd: FileDescripter, new_fd: FileDescripter) -> Result { +pub fn sys_dup2(old_fd: FileDesc, new_fd: FileDesc) -> Result { log_syscall_entry!(SYS_DUP2); debug!("old_fd = {}, new_fd = {}", old_fd, new_fd); diff --git a/kernel/aster-nix/src/syscall/epoll.rs b/kernel/aster-nix/src/syscall/epoll.rs index f71fc0418..7044b6559 100644 --- a/kernel/aster-nix/src/syscall/epoll.rs +++ b/kernel/aster-nix/src/syscall/epoll.rs @@ -7,7 +7,7 @@ use crate::{ events::IoEvents, fs::{ epoll::{EpollCtl, EpollEvent, EpollFile, EpollFlags}, - file_table::{FdFlags, FileDescripter}, + file_table::{FdFlags, FileDesc}, utils::CreationFlags, }, log_syscall_entry, @@ -47,9 +47,9 @@ pub fn sys_epoll_create1(flags: u32) -> Result { } pub fn sys_epoll_ctl( - epfd: FileDescripter, + epfd: FileDesc, op: i32, - fd: FileDescripter, + fd: FileDesc, event_addr: Vaddr, ) -> Result { log_syscall_entry!(SYS_EPOLL_CTL); @@ -93,7 +93,7 @@ pub fn sys_epoll_ctl( } pub fn sys_epoll_wait( - epfd: FileDescripter, + epfd: FileDesc, events_addr: Vaddr, max_events: i32, timeout: i32, @@ -138,7 +138,7 @@ pub fn sys_epoll_wait( } pub fn sys_epoll_pwait( - epfd: FileDescripter, + epfd: FileDesc, events_addr: Vaddr, max_events: i32, timeout: i32, diff --git a/kernel/aster-nix/src/syscall/execve.rs b/kernel/aster-nix/src/syscall/execve.rs index f43c83027..6d028f1ea 100644 --- a/kernel/aster-nix/src/syscall/execve.rs +++ b/kernel/aster-nix/src/syscall/execve.rs @@ -6,7 +6,7 @@ use aster_rights::WriteOp; use super::{constants::*, SyscallReturn}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, utils::{Dentry, InodeType}, }, @@ -38,7 +38,7 @@ pub fn sys_execve( } pub fn sys_execveat( - dfd: FileDescripter, + dfd: FileDesc, filename_ptr: Vaddr, argv_ptr_ptr: Vaddr, envp_ptr_ptr: Vaddr, @@ -58,7 +58,7 @@ pub fn sys_execveat( } fn lookup_executable_file( - dfd: FileDescripter, + dfd: FileDesc, filename: String, flags: OpenFlags, ) -> Result> { diff --git a/kernel/aster-nix/src/syscall/fcntl.rs b/kernel/aster-nix/src/syscall/fcntl.rs index 664013fff..0217f5697 100644 --- a/kernel/aster-nix/src/syscall/fcntl.rs +++ b/kernel/aster-nix/src/syscall/fcntl.rs @@ -3,14 +3,14 @@ use super::{SyscallReturn, SYS_FCNTL}; use crate::{ fs::{ - file_table::{FdFlags, FileDescripter}, + file_table::{FdFlags, FileDesc}, utils::StatusFlags, }, log_syscall_entry, prelude::*, }; -pub fn sys_fcntl(fd: FileDescripter, cmd: i32, arg: u64) -> Result { +pub fn sys_fcntl(fd: FileDesc, cmd: i32, arg: u64) -> Result { log_syscall_entry!(SYS_FCNTL); let fcntl_cmd = FcntlCmd::try_from(cmd)?; debug!("fd = {}, cmd = {:?}, arg = {}", fd, fcntl_cmd, arg); @@ -18,13 +18,13 @@ pub fn sys_fcntl(fd: FileDescripter, cmd: i32, arg: u64) -> Result { let current = current!(); let mut file_table = current.file_table().lock(); - let new_fd = file_table.dup(fd, arg as FileDescripter, FdFlags::empty())?; + let new_fd = file_table.dup(fd, arg as FileDesc, FdFlags::empty())?; Ok(SyscallReturn::Return(new_fd as _)) } FcntlCmd::F_DUPFD_CLOEXEC => { let current = current!(); let mut file_table = current.file_table().lock(); - let new_fd = file_table.dup(fd, arg as FileDescripter, FdFlags::CLOEXEC)?; + let new_fd = file_table.dup(fd, arg as FileDesc, FdFlags::CLOEXEC)?; Ok(SyscallReturn::Return(new_fd as _)) } FcntlCmd::F_GETFD => { diff --git a/kernel/aster-nix/src/syscall/fsync.rs b/kernel/aster-nix/src/syscall/fsync.rs index 5ac1c557b..2e657f46b 100644 --- a/kernel/aster-nix/src/syscall/fsync.rs +++ b/kernel/aster-nix/src/syscall/fsync.rs @@ -2,12 +2,12 @@ use super::{SyscallReturn, SYS_FSYNC}; use crate::{ - fs::{file_table::FileDescripter, inode_handle::InodeHandle}, + fs::{file_table::FileDesc, inode_handle::InodeHandle}, log_syscall_entry, prelude::*, }; -pub fn sys_fsync(fd: FileDescripter) -> Result { +pub fn sys_fsync(fd: FileDesc) -> Result { log_syscall_entry!(SYS_FSYNC); debug!("fd = {}", fd); diff --git a/kernel/aster-nix/src/syscall/getdents64.rs b/kernel/aster-nix/src/syscall/getdents64.rs index 4d250ac3e..0772678b2 100644 --- a/kernel/aster-nix/src/syscall/getdents64.rs +++ b/kernel/aster-nix/src/syscall/getdents64.rs @@ -5,7 +5,7 @@ use core::marker::PhantomData; use super::{SyscallReturn, SYS_GETDENTS64}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, inode_handle::InodeHandle, utils::{DirentVisitor, InodeType}, }, @@ -14,11 +14,7 @@ use crate::{ util::write_bytes_to_user, }; -pub fn sys_getdents64( - fd: FileDescripter, - buf_addr: Vaddr, - buf_len: usize, -) -> Result { +pub fn sys_getdents64(fd: FileDesc, buf_addr: Vaddr, buf_len: usize) -> Result { log_syscall_entry!(SYS_GETDENTS64); debug!( "fd = {}, buf_addr = 0x{:x}, buf_len = 0x{:x}", diff --git a/kernel/aster-nix/src/syscall/getpeername.rs b/kernel/aster-nix/src/syscall/getpeername.rs index 87ab7670b..26f61c037 100644 --- a/kernel/aster-nix/src/syscall/getpeername.rs +++ b/kernel/aster-nix/src/syscall/getpeername.rs @@ -2,17 +2,13 @@ use super::{SyscallReturn, SYS_GETPEERNAME}; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, util::net::{get_socket_from_fd, write_socket_addr_to_user}, }; -pub fn sys_getpeername( - sockfd: FileDescripter, - addr: Vaddr, - addrlen_ptr: Vaddr, -) -> Result { +pub fn sys_getpeername(sockfd: FileDesc, addr: Vaddr, addrlen_ptr: Vaddr) -> Result { log_syscall_entry!(SYS_GETPEERNAME); debug!("sockfd = {sockfd}, addr = 0x{addr:x}, addrlen_ptr = 0x{addrlen_ptr:x}"); diff --git a/kernel/aster-nix/src/syscall/getsockname.rs b/kernel/aster-nix/src/syscall/getsockname.rs index 68baf22f5..5de045696 100644 --- a/kernel/aster-nix/src/syscall/getsockname.rs +++ b/kernel/aster-nix/src/syscall/getsockname.rs @@ -2,17 +2,13 @@ use super::{SyscallReturn, SYS_GETSOCKNAME}; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, util::net::{get_socket_from_fd, write_socket_addr_to_user}, }; -pub fn sys_getsockname( - sockfd: FileDescripter, - addr: Vaddr, - addrlen_ptr: Vaddr, -) -> Result { +pub fn sys_getsockname(sockfd: FileDesc, addr: Vaddr, addrlen_ptr: Vaddr) -> Result { log_syscall_entry!(SYS_GETSOCKNAME); debug!("sockfd = {sockfd}, addr = 0x{addr:x}, addrlen_ptr = 0x{addrlen_ptr:x}"); diff --git a/kernel/aster-nix/src/syscall/getsockopt.rs b/kernel/aster-nix/src/syscall/getsockopt.rs index 016cb94a2..5ba710d23 100644 --- a/kernel/aster-nix/src/syscall/getsockopt.rs +++ b/kernel/aster-nix/src/syscall/getsockopt.rs @@ -2,7 +2,7 @@ use super::{SyscallReturn, SYS_SETSOCKOPT}; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, util::{ @@ -12,7 +12,7 @@ use crate::{ }; pub fn sys_getsockopt( - sockfd: FileDescripter, + sockfd: FileDesc, level: i32, optname: i32, optval: Vaddr, diff --git a/kernel/aster-nix/src/syscall/ioctl.rs b/kernel/aster-nix/src/syscall/ioctl.rs index 0e7b3bd46..fcc3c74a7 100644 --- a/kernel/aster-nix/src/syscall/ioctl.rs +++ b/kernel/aster-nix/src/syscall/ioctl.rs @@ -2,12 +2,12 @@ use super::{SyscallReturn, SYS_IOCTL}; use crate::{ - fs::{file_table::FileDescripter, utils::IoctlCmd}, + fs::{file_table::FileDesc, utils::IoctlCmd}, log_syscall_entry, prelude::*, }; -pub fn sys_ioctl(fd: FileDescripter, cmd: u32, arg: Vaddr) -> Result { +pub fn sys_ioctl(fd: FileDesc, cmd: u32, arg: Vaddr) -> Result { log_syscall_entry!(SYS_IOCTL); let ioctl_cmd = IoctlCmd::try_from(cmd)?; debug!( diff --git a/kernel/aster-nix/src/syscall/link.rs b/kernel/aster-nix/src/syscall/link.rs index 4e32c5128..c53da44c0 100644 --- a/kernel/aster-nix/src/syscall/link.rs +++ b/kernel/aster-nix/src/syscall/link.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_LINKAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, }, log_syscall_entry, @@ -13,9 +13,9 @@ use crate::{ }; pub fn sys_linkat( - old_dirfd: FileDescripter, + old_dirfd: FileDesc, old_pathname_addr: Vaddr, - new_dirfd: FileDescripter, + new_dirfd: FileDesc, new_pathname_addr: Vaddr, flags: u32, ) -> Result { diff --git a/kernel/aster-nix/src/syscall/listen.rs b/kernel/aster-nix/src/syscall/listen.rs index 97ef960e5..d3b0e5a84 100644 --- a/kernel/aster-nix/src/syscall/listen.rs +++ b/kernel/aster-nix/src/syscall/listen.rs @@ -2,10 +2,10 @@ use super::{SyscallReturn, SYS_LISTEN}; use crate::{ - fs::file_table::FileDescripter, log_syscall_entry, prelude::*, util::net::get_socket_from_fd, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, util::net::get_socket_from_fd, }; -pub fn sys_listen(sockfd: FileDescripter, backlog: i32) -> Result { +pub fn sys_listen(sockfd: FileDesc, backlog: i32) -> Result { log_syscall_entry!(SYS_LISTEN); debug!("sockfd = {sockfd}, backlog = {backlog}"); diff --git a/kernel/aster-nix/src/syscall/lseek.rs b/kernel/aster-nix/src/syscall/lseek.rs index 5451737e0..6d6065ff1 100644 --- a/kernel/aster-nix/src/syscall/lseek.rs +++ b/kernel/aster-nix/src/syscall/lseek.rs @@ -2,12 +2,12 @@ use super::{SyscallReturn, SYS_LSEEK}; use crate::{ - fs::{file_table::FileDescripter, utils::SeekFrom}, + fs::{file_table::FileDesc, utils::SeekFrom}, log_syscall_entry, prelude::*, }; -pub fn sys_lseek(fd: FileDescripter, offset: isize, whence: u32) -> Result { +pub fn sys_lseek(fd: FileDesc, offset: isize, whence: u32) -> Result { log_syscall_entry!(SYS_LSEEK); debug!("fd = {}, offset = {}, whence = {}", fd, offset, whence); let seek_from = match whence { diff --git a/kernel/aster-nix/src/syscall/mkdir.rs b/kernel/aster-nix/src/syscall/mkdir.rs index 23520e6ba..461af7f33 100644 --- a/kernel/aster-nix/src/syscall/mkdir.rs +++ b/kernel/aster-nix/src/syscall/mkdir.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_MKDIRAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, utils::{InodeMode, InodeType}, }, @@ -13,11 +13,7 @@ use crate::{ util::read_cstring_from_user, }; -pub fn sys_mkdirat( - dirfd: FileDescripter, - pathname_addr: Vaddr, - mode: u16, -) -> Result { +pub fn sys_mkdirat(dirfd: FileDesc, pathname_addr: Vaddr, mode: u16) -> Result { log_syscall_entry!(SYS_MKDIRAT); let pathname = read_cstring_from_user(pathname_addr, MAX_FILENAME_LEN)?; debug!( diff --git a/kernel/aster-nix/src/syscall/mmap.rs b/kernel/aster-nix/src/syscall/mmap.rs index f470c3322..afe8a824e 100644 --- a/kernel/aster-nix/src/syscall/mmap.rs +++ b/kernel/aster-nix/src/syscall/mmap.rs @@ -8,7 +8,7 @@ use aster_rights::Rights; use super::SyscallReturn; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, syscall::SYS_MMAP, @@ -45,7 +45,7 @@ fn do_sys_mmap( len: usize, vm_perm: VmPerm, option: MMapOptions, - fd: FileDescripter, + fd: FileDesc, offset: usize, ) -> Result { debug!( @@ -94,7 +94,7 @@ fn alloc_anonyous_vmo(len: usize) -> Result { } fn alloc_filebacked_vmo( - fd: FileDescripter, + fd: FileDesc, len: usize, offset: usize, option: &MMapOptions, diff --git a/kernel/aster-nix/src/syscall/open.rs b/kernel/aster-nix/src/syscall/open.rs index e5794a071..4fd739fad 100644 --- a/kernel/aster-nix/src/syscall/open.rs +++ b/kernel/aster-nix/src/syscall/open.rs @@ -4,7 +4,7 @@ use super::{SyscallReturn, SYS_OPENAT}; use crate::{ fs::{ file_handle::FileLike, - file_table::{FdFlags, FileDescripter}, + file_table::{FdFlags, FileDesc}, fs_resolver::{FsPath, AT_FDCWD}, utils::CreationFlags, }, @@ -15,7 +15,7 @@ use crate::{ }; pub fn sys_openat( - dirfd: FileDescripter, + dirfd: FileDesc, pathname_addr: Vaddr, flags: u32, mode: u16, diff --git a/kernel/aster-nix/src/syscall/pipe.rs b/kernel/aster-nix/src/syscall/pipe.rs index 035e8f962..164b7005c 100644 --- a/kernel/aster-nix/src/syscall/pipe.rs +++ b/kernel/aster-nix/src/syscall/pipe.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_PIPE2}; use crate::{ fs::{ - file_table::{FdFlags, FileDescripter}, + file_table::{FdFlags, FileDesc}, pipe::{PipeReader, PipeWriter}, utils::{Channel, CreationFlags, StatusFlags}, }, @@ -50,8 +50,8 @@ pub fn sys_pipe(fds: Vaddr) -> Result { #[derive(Debug, Clone, Copy, Pod)] #[repr(C)] struct PipeFds { - reader_fd: FileDescripter, - writer_fd: FileDescripter, + reader_fd: FileDesc, + writer_fd: FileDesc, } const PIPE_BUF_SIZE: usize = 1024 * 1024; diff --git a/kernel/aster-nix/src/syscall/poll.rs b/kernel/aster-nix/src/syscall/poll.rs index 7d8a82abb..5f170dd1d 100644 --- a/kernel/aster-nix/src/syscall/poll.rs +++ b/kernel/aster-nix/src/syscall/poll.rs @@ -5,7 +5,7 @@ use core::{cell::Cell, time::Duration}; use super::{SyscallReturn, SYS_POLL}; use crate::{ events::IoEvents, - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, process::signal::Poller, @@ -112,13 +112,13 @@ struct c_pollfd { #[derive(Debug, Clone)] pub struct PollFd { - fd: Option, + fd: Option, events: IoEvents, revents: Cell, } impl PollFd { - pub fn new(fd: Option, events: IoEvents) -> Self { + pub fn new(fd: Option, events: IoEvents) -> Self { let revents = Cell::new(IoEvents::empty()); Self { fd, @@ -127,7 +127,7 @@ impl PollFd { } } - pub fn fd(&self) -> Option { + pub fn fd(&self) -> Option { self.fd } @@ -143,7 +143,7 @@ impl PollFd { impl From for PollFd { fn from(raw: c_pollfd) -> Self { let fd = if raw.fd >= 0 { - Some(raw.fd as FileDescripter) + Some(raw.fd as FileDesc) } else { None }; diff --git a/kernel/aster-nix/src/syscall/pread64.rs b/kernel/aster-nix/src/syscall/pread64.rs index 0c864a341..b0d44d957 100644 --- a/kernel/aster-nix/src/syscall/pread64.rs +++ b/kernel/aster-nix/src/syscall/pread64.rs @@ -2,18 +2,13 @@ use super::{SyscallReturn, SYS_PREAD64}; use crate::{ - fs::{file_table::FileDescripter, utils::SeekFrom}, + fs::{file_table::FileDesc, utils::SeekFrom}, log_syscall_entry, prelude::*, util::write_bytes_to_user, }; -pub fn sys_pread64( - fd: FileDescripter, - buf_ptr: Vaddr, - count: usize, - pos: i64, -) -> Result { +pub fn sys_pread64(fd: FileDesc, buf_ptr: Vaddr, count: usize, pos: i64) -> Result { log_syscall_entry!(SYS_PREAD64); debug!( "fd = {}, buf = 0x{:x}, count = 0x{:x}, pos = 0x{:x}", diff --git a/kernel/aster-nix/src/syscall/read.rs b/kernel/aster-nix/src/syscall/read.rs index d7d035936..ef8a93489 100644 --- a/kernel/aster-nix/src/syscall/read.rs +++ b/kernel/aster-nix/src/syscall/read.rs @@ -1,11 +1,9 @@ // SPDX-License-Identifier: MPL-2.0 use super::{SyscallReturn, SYS_READ}; -use crate::{ - fs::file_table::FileDescripter, log_syscall_entry, prelude::*, util::write_bytes_to_user, -}; +use crate::{fs::file_table::FileDesc, log_syscall_entry, prelude::*, util::write_bytes_to_user}; -pub fn sys_read(fd: FileDescripter, user_buf_addr: Vaddr, buf_len: usize) -> Result { +pub fn sys_read(fd: FileDesc, user_buf_addr: Vaddr, buf_len: usize) -> Result { log_syscall_entry!(SYS_READ); debug!( "fd = {}, user_buf_ptr = 0x{:x}, buf_len = 0x{:x}", diff --git a/kernel/aster-nix/src/syscall/readlink.rs b/kernel/aster-nix/src/syscall/readlink.rs index 706645a4f..95b3a78e3 100644 --- a/kernel/aster-nix/src/syscall/readlink.rs +++ b/kernel/aster-nix/src/syscall/readlink.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_READLINKAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, }, log_syscall_entry, @@ -13,7 +13,7 @@ use crate::{ }; pub fn sys_readlinkat( - dirfd: FileDescripter, + dirfd: FileDesc, pathname_addr: Vaddr, usr_buf_addr: Vaddr, usr_buf_len: usize, diff --git a/kernel/aster-nix/src/syscall/recvfrom.rs b/kernel/aster-nix/src/syscall/recvfrom.rs index 658a91bdb..2cb24dec1 100644 --- a/kernel/aster-nix/src/syscall/recvfrom.rs +++ b/kernel/aster-nix/src/syscall/recvfrom.rs @@ -2,7 +2,7 @@ use super::{SyscallReturn, SYS_RECVFROM}; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, net::socket::SendRecvFlags, prelude::*, @@ -13,7 +13,7 @@ use crate::{ }; pub fn sys_recvfrom( - sockfd: FileDescripter, + sockfd: FileDesc, buf: Vaddr, len: usize, flags: i32, diff --git a/kernel/aster-nix/src/syscall/rename.rs b/kernel/aster-nix/src/syscall/rename.rs index ecab80ae0..eba3c1d8a 100644 --- a/kernel/aster-nix/src/syscall/rename.rs +++ b/kernel/aster-nix/src/syscall/rename.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_RENAMEAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, utils::InodeType, }, @@ -14,9 +14,9 @@ use crate::{ }; pub fn sys_renameat( - old_dirfd: FileDescripter, + old_dirfd: FileDesc, old_pathname_addr: Vaddr, - new_dirfd: FileDescripter, + new_dirfd: FileDesc, new_pathname_addr: Vaddr, ) -> Result { log_syscall_entry!(SYS_RENAMEAT); diff --git a/kernel/aster-nix/src/syscall/rmdir.rs b/kernel/aster-nix/src/syscall/rmdir.rs index 5a2617655..db2384bd8 100644 --- a/kernel/aster-nix/src/syscall/rmdir.rs +++ b/kernel/aster-nix/src/syscall/rmdir.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_RMDIR}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, }, log_syscall_entry, @@ -16,7 +16,7 @@ pub fn sys_rmdir(pathname_addr: Vaddr) -> Result { self::sys_rmdirat(AT_FDCWD, pathname_addr) } -pub(super) fn sys_rmdirat(dirfd: FileDescripter, pathname_addr: Vaddr) -> Result { +pub(super) fn sys_rmdirat(dirfd: FileDesc, pathname_addr: Vaddr) -> Result { log_syscall_entry!(SYS_RMDIR); let pathname = read_cstring_from_user(pathname_addr, MAX_FILENAME_LEN)?; debug!("dirfd = {}, pathname = {:?}", dirfd, pathname); diff --git a/kernel/aster-nix/src/syscall/select.rs b/kernel/aster-nix/src/syscall/select.rs index b3978173b..6b7b9409e 100644 --- a/kernel/aster-nix/src/syscall/select.rs +++ b/kernel/aster-nix/src/syscall/select.rs @@ -8,7 +8,7 @@ use super::{ }; use crate::{ events::IoEvents, - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, time::timeval_t, @@ -16,7 +16,7 @@ use crate::{ }; pub fn sys_select( - nfds: FileDescripter, + nfds: FileDesc, readfds_addr: Vaddr, writefds_addr: Vaddr, exceptfds_addr: Vaddr, @@ -76,7 +76,7 @@ pub fn sys_select( } fn do_select( - nfds: FileDescripter, + nfds: FileDesc, mut readfds: Option<&mut FdSet>, mut writefds: Option<&mut FdSet>, mut exceptfds: Option<&mut FdSet>, @@ -184,7 +184,7 @@ struct FdSet { impl FdSet { /// Equivalent to FD_SET. - pub fn set(&mut self, fd: FileDescripter) -> Result<()> { + pub fn set(&mut self, fd: FileDesc) -> Result<()> { let fd = fd as usize; if fd >= FD_SETSIZE { return_errno_with_message!(Errno::EINVAL, "fd exceeds FD_SETSIZE"); @@ -194,7 +194,7 @@ impl FdSet { } /// Equivalent to FD_CLR. - pub fn unset(&mut self, fd: FileDescripter) -> Result<()> { + pub fn unset(&mut self, fd: FileDesc) -> Result<()> { let fd = fd as usize; if fd >= FD_SETSIZE { return_errno_with_message!(Errno::EINVAL, "fd exceeds FD_SETSIZE"); @@ -204,7 +204,7 @@ impl FdSet { } /// Equivalent to FD_ISSET. - pub fn is_set(&self, fd: FileDescripter) -> bool { + pub fn is_set(&self, fd: FileDesc) -> bool { let fd = fd as usize; if fd >= FD_SETSIZE { return false; diff --git a/kernel/aster-nix/src/syscall/sendto.rs b/kernel/aster-nix/src/syscall/sendto.rs index e5606bb39..4d3cd7a84 100644 --- a/kernel/aster-nix/src/syscall/sendto.rs +++ b/kernel/aster-nix/src/syscall/sendto.rs @@ -2,7 +2,7 @@ use super::{SyscallReturn, SYS_SENDTO}; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, net::socket::SendRecvFlags, prelude::*, @@ -13,7 +13,7 @@ use crate::{ }; pub fn sys_sendto( - sockfd: FileDescripter, + sockfd: FileDesc, buf: Vaddr, len: usize, flags: i32, diff --git a/kernel/aster-nix/src/syscall/setsockopt.rs b/kernel/aster-nix/src/syscall/setsockopt.rs index 66d8d4d78..b62b1b16f 100644 --- a/kernel/aster-nix/src/syscall/setsockopt.rs +++ b/kernel/aster-nix/src/syscall/setsockopt.rs @@ -2,14 +2,14 @@ use super::{SyscallReturn, SYS_SETSOCKOPT}; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, util::net::{get_socket_from_fd, new_raw_socket_option, CSocketOptionLevel}, }; pub fn sys_setsockopt( - sockfd: FileDescripter, + sockfd: FileDesc, level: i32, optname: i32, optval: Vaddr, diff --git a/kernel/aster-nix/src/syscall/shutdown.rs b/kernel/aster-nix/src/syscall/shutdown.rs index 8a1a12d48..5eb2a71dc 100644 --- a/kernel/aster-nix/src/syscall/shutdown.rs +++ b/kernel/aster-nix/src/syscall/shutdown.rs @@ -2,11 +2,11 @@ use super::{SyscallReturn, SYS_SHUTDOWN}; use crate::{ - fs::file_table::FileDescripter, log_syscall_entry, net::socket::SockShutdownCmd, prelude::*, + fs::file_table::FileDesc, log_syscall_entry, net::socket::SockShutdownCmd, prelude::*, util::net::get_socket_from_fd, }; -pub fn sys_shutdown(sockfd: FileDescripter, how: i32) -> Result { +pub fn sys_shutdown(sockfd: FileDesc, how: i32) -> Result { log_syscall_entry!(SYS_SHUTDOWN); let shutdown_cmd = SockShutdownCmd::try_from(how)?; debug!("sockfd = {sockfd}, cmd = {shutdown_cmd:?}"); diff --git a/kernel/aster-nix/src/syscall/socketpair.rs b/kernel/aster-nix/src/syscall/socketpair.rs index 9828e694f..5fcef0d2c 100644 --- a/kernel/aster-nix/src/syscall/socketpair.rs +++ b/kernel/aster-nix/src/syscall/socketpair.rs @@ -2,7 +2,7 @@ use super::{SyscallReturn, SYS_SOCKETPAIR}; use crate::{ - fs::file_table::{FdFlags, FileDescripter}, + fs::file_table::{FdFlags, FileDesc}, log_syscall_entry, net::socket::unix::UnixStreamSocket, prelude::*, @@ -54,4 +54,4 @@ pub fn sys_socketpair(domain: i32, type_: i32, protocol: i32, sv: Vaddr) -> Resu #[repr(C)] #[derive(Debug, Clone, Copy, Pod)] -struct SocketFds(FileDescripter, FileDescripter); +struct SocketFds(FileDesc, FileDesc); diff --git a/kernel/aster-nix/src/syscall/stat.rs b/kernel/aster-nix/src/syscall/stat.rs index 3a4447983..fd0e3b66a 100644 --- a/kernel/aster-nix/src/syscall/stat.rs +++ b/kernel/aster-nix/src/syscall/stat.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_FSTAT, SYS_FSTATAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, utils::Metadata, }, @@ -14,7 +14,7 @@ use crate::{ util::{read_cstring_from_user, write_val_to_user}, }; -pub fn sys_fstat(fd: FileDescripter, stat_buf_ptr: Vaddr) -> Result { +pub fn sys_fstat(fd: FileDesc, stat_buf_ptr: Vaddr) -> Result { log_syscall_entry!(SYS_FSTAT); debug!("fd = {}, stat_buf_addr = 0x{:x}", fd, stat_buf_ptr); @@ -40,7 +40,7 @@ pub fn sys_lstat(filename_ptr: Vaddr, stat_buf_ptr: Vaddr) -> Result Result Result { +pub fn sys_fstatfs(fd: FileDesc, statfs_buf_ptr: Vaddr) -> Result { log_syscall_entry!(SYS_FSTATFS); debug!("fd = {}, statfs_buf_addr = 0x{:x}", fd, statfs_buf_ptr); diff --git a/kernel/aster-nix/src/syscall/symlink.rs b/kernel/aster-nix/src/syscall/symlink.rs index 73e8fa49d..987bbcbf8 100644 --- a/kernel/aster-nix/src/syscall/symlink.rs +++ b/kernel/aster-nix/src/syscall/symlink.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_SYMLINKAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, utils::{InodeMode, InodeType}, }, @@ -15,7 +15,7 @@ use crate::{ pub fn sys_symlinkat( target_addr: Vaddr, - dirfd: FileDescripter, + dirfd: FileDesc, linkpath_addr: Vaddr, ) -> Result { log_syscall_entry!(SYS_SYMLINKAT); diff --git a/kernel/aster-nix/src/syscall/truncate.rs b/kernel/aster-nix/src/syscall/truncate.rs index f57669d98..0c1e68336 100644 --- a/kernel/aster-nix/src/syscall/truncate.rs +++ b/kernel/aster-nix/src/syscall/truncate.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_FTRUNCATE, SYS_TRUNCATE}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, utils::PATH_MAX, }, @@ -13,7 +13,7 @@ use crate::{ util::read_cstring_from_user, }; -pub fn sys_ftruncate(fd: FileDescripter, len: isize) -> Result { +pub fn sys_ftruncate(fd: FileDesc, len: isize) -> Result { log_syscall_entry!(SYS_FTRUNCATE); debug!("fd = {}, lentgh = {}", fd, len); diff --git a/kernel/aster-nix/src/syscall/unlink.rs b/kernel/aster-nix/src/syscall/unlink.rs index 8a7126eee..4eb4f99d8 100644 --- a/kernel/aster-nix/src/syscall/unlink.rs +++ b/kernel/aster-nix/src/syscall/unlink.rs @@ -3,7 +3,7 @@ use super::{SyscallReturn, SYS_UNLINKAT}; use crate::{ fs::{ - file_table::FileDescripter, + file_table::FileDesc, fs_resolver::{FsPath, AT_FDCWD}, }, log_syscall_entry, @@ -12,11 +12,7 @@ use crate::{ util::read_cstring_from_user, }; -pub fn sys_unlinkat( - dirfd: FileDescripter, - pathname_addr: Vaddr, - flags: u32, -) -> Result { +pub fn sys_unlinkat(dirfd: FileDesc, pathname_addr: Vaddr, flags: u32) -> Result { let flags = UnlinkFlags::from_bits(flags).ok_or(Error::with_message(Errno::EINVAL, "invalid flags"))?; if flags.contains(UnlinkFlags::AT_REMOVEDIR) { diff --git a/kernel/aster-nix/src/syscall/utimens.rs b/kernel/aster-nix/src/syscall/utimens.rs index 5b57e4060..e92a4212f 100644 --- a/kernel/aster-nix/src/syscall/utimens.rs +++ b/kernel/aster-nix/src/syscall/utimens.rs @@ -4,7 +4,7 @@ use core::time::Duration; use super::{SyscallReturn, SYS_UTIMENSAT}; use crate::{ - fs::{file_table::FileDescripter, fs_resolver::FsPath}, + fs::{file_table::FileDesc, fs_resolver::FsPath}, log_syscall_entry, prelude::*, syscall::constants::MAX_FILENAME_LEN, @@ -13,7 +13,7 @@ use crate::{ }; pub fn sys_utimensat( - dirfd: FileDescripter, + dirfd: FileDesc, pathname_ptr: Vaddr, timespecs_ptr: Vaddr, flags: u32, diff --git a/kernel/aster-nix/src/syscall/write.rs b/kernel/aster-nix/src/syscall/write.rs index aca9eb928..964d6498e 100644 --- a/kernel/aster-nix/src/syscall/write.rs +++ b/kernel/aster-nix/src/syscall/write.rs @@ -2,18 +2,14 @@ use super::SyscallReturn; use crate::{ - fs::file_table::FileDescripter, log_syscall_entry, prelude::*, syscall::SYS_WRITE, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, syscall::SYS_WRITE, util::read_bytes_from_user, }; const STDOUT: u64 = 1; const STDERR: u64 = 2; -pub fn sys_write( - fd: FileDescripter, - user_buf_ptr: Vaddr, - user_buf_len: usize, -) -> Result { +pub fn sys_write(fd: FileDesc, user_buf_ptr: Vaddr, user_buf_len: usize) -> Result { log_syscall_entry!(SYS_WRITE); debug!( "fd = {}, user_buf_ptr = 0x{:x}, user_buf_len = 0x{:x}", diff --git a/kernel/aster-nix/src/syscall/writev.rs b/kernel/aster-nix/src/syscall/writev.rs index e2e71cd38..720cd0af5 100644 --- a/kernel/aster-nix/src/syscall/writev.rs +++ b/kernel/aster-nix/src/syscall/writev.rs @@ -2,7 +2,7 @@ use super::SyscallReturn; use crate::{ - fs::file_table::FileDescripter, + fs::file_table::FileDesc, log_syscall_entry, prelude::*, syscall::SYS_WRITEV, @@ -18,17 +18,13 @@ pub struct IoVec { len: usize, } -pub fn sys_writev( - fd: FileDescripter, - io_vec_ptr: Vaddr, - io_vec_count: usize, -) -> Result { +pub fn sys_writev(fd: FileDesc, io_vec_ptr: Vaddr, io_vec_count: usize) -> Result { log_syscall_entry!(SYS_WRITEV); let res = do_sys_writev(fd, io_vec_ptr, io_vec_count)?; Ok(SyscallReturn::Return(res as _)) } -fn do_sys_writev(fd: FileDescripter, io_vec_ptr: Vaddr, io_vec_count: usize) -> Result { +fn do_sys_writev(fd: FileDesc, io_vec_ptr: Vaddr, io_vec_count: usize) -> Result { debug!( "fd = {}, io_vec_ptr = 0x{:x}, io_vec_counter = 0x{:x}", fd, io_vec_ptr, io_vec_count diff --git a/kernel/aster-nix/src/util/net/mod.rs b/kernel/aster-nix/src/util/net/mod.rs index 8a837e2a9..e47c40369 100644 --- a/kernel/aster-nix/src/util/net/mod.rs +++ b/kernel/aster-nix/src/util/net/mod.rs @@ -8,9 +8,9 @@ pub use addr::{read_socket_addr_from_user, write_socket_addr_to_user, CSocketAdd pub use options::{new_raw_socket_option, CSocketOptionLevel}; pub use socket::{Protocol, SockFlags, SockType, SOCK_TYPE_MASK}; -use crate::{fs::file_table::FileDescripter, net::socket::Socket, prelude::*}; +use crate::{fs::file_table::FileDesc, net::socket::Socket, prelude::*}; -pub fn get_socket_from_fd(sockfd: FileDescripter) -> Result> { +pub fn get_socket_from_fd(sockfd: FileDesc) -> Result> { let current = current!(); let file_table = current.file_table().lock(); file_table.get_socket(sockfd)