From 8bfef4086fe97168b9a39904678b66663b8d7353 Mon Sep 17 00:00:00 2001 From: LI Qing Date: Mon, 11 Jan 2021 18:47:06 +0800 Subject: [PATCH] Polish the function names in FS --- src/libos/src/fs/event_file.rs | 10 +++++----- src/libos/src/fs/file.rs | 8 ++++---- src/libos/src/fs/file_ops/fcntl.rs | 4 ++-- src/libos/src/fs/file_ops/fspath.rs | 2 +- src/libos/src/fs/fs_view.rs | 12 ++++++------ src/libos/src/fs/inode_file.rs | 6 +++--- src/libos/src/fs/pipe.rs | 8 ++++---- src/libos/src/fs/stdio.rs | 8 ++++---- src/libos/src/net/io_multiplexing/poll.rs | 4 ++-- src/libos/src/net/socket/host/socket_file.rs | 4 ++-- src/libos/src/net/socket/unix/stream/file.rs | 4 ++-- src/libos/src/vm/vm_manager.rs | 2 +- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/libos/src/fs/event_file.rs b/src/libos/src/fs/event_file.rs index 0d99b1d8..224e8a9c 100644 --- a/src/libos/src/fs/event_file.rs +++ b/src/libos/src/fs/event_file.rs @@ -29,7 +29,7 @@ impl EventFile { }) } - pub fn get_host_fd(&self) -> c_int { + pub fn host_fd(&self) -> c_int { self.host_fd.to_raw() as c_int } } @@ -73,12 +73,12 @@ impl File for EventFile { Ok(ret) } - fn get_access_mode(&self) -> Result { + fn access_mode(&self) -> Result { Ok(AccessMode::O_RDWR) } - fn get_status_flags(&self) -> Result { - let ret = try_libc!(libc::ocall::fcntl_arg0(self.get_host_fd(), libc::F_GETFL)); + fn status_flags(&self) -> Result { + let ret = try_libc!(libc::ocall::fcntl_arg0(self.host_fd(), libc::F_GETFL)); Ok(StatusFlags::from_bits_truncate(ret as u32)) } @@ -90,7 +90,7 @@ impl File for EventFile { | StatusFlags::O_NONBLOCK; let raw_status_flags = (new_status_flags & valid_flags_mask).bits(); try_libc!(libc::ocall::fcntl_arg1( - self.get_host_fd(), + self.host_fd(), libc::F_SETFL, raw_status_flags as c_int )); diff --git a/src/libos/src/fs/file.rs b/src/libos/src/fs/file.rs index dda0e57f..bb5ead4e 100644 --- a/src/libos/src/fs/file.rs +++ b/src/libos/src/fs/file.rs @@ -71,12 +71,12 @@ pub trait File: Debug + Sync + Send + Any { return_op_unsupported_error!("ioctl") } - fn get_access_mode(&self) -> Result { - return_op_unsupported_error!("get_access_mode") + fn access_mode(&self) -> Result { + return_op_unsupported_error!("access_mode") } - fn get_status_flags(&self) -> Result { - return_op_unsupported_error!("get_status_flags") + fn status_flags(&self) -> Result { + return_op_unsupported_error!("status_flags") } fn set_status_flags(&self, new_status_flags: StatusFlags) -> Result<()> { diff --git a/src/libos/src/fs/file_ops/fcntl.rs b/src/libos/src/fs/file_ops/fcntl.rs index 31b8115a..b1703a4e 100644 --- a/src/libos/src/fs/file_ops/fcntl.rs +++ b/src/libos/src/fs/file_ops/fcntl.rs @@ -82,8 +82,8 @@ pub fn do_fcntl(fd: FileDesc, cmd: &mut FcntlCmd) -> Result { } FcntlCmd::GetFl() => { let file = file_table.get(fd)?; - let status_flags = file.get_status_flags()?; - let access_mode = file.get_access_mode()?; + let status_flags = file.status_flags()?; + let access_mode = file.access_mode()?; (status_flags.bits() | access_mode as u32) as isize } FcntlCmd::SetFl(flags) => { diff --git a/src/libos/src/fs/file_ops/fspath.rs b/src/libos/src/fs/file_ops/fspath.rs index 30c31548..a0f3b84f 100644 --- a/src/libos/src/fs/file_ops/fspath.rs +++ b/src/libos/src/fs/file_ops/fspath.rs @@ -98,7 +98,7 @@ fn get_abs_path_by_fd(fd: FileDesc) -> Result { let path = { let file_ref = current!().file(fd)?; if let Ok(inode_file) = file_ref.as_inode_file() { - inode_file.get_abs_path().to_owned() + inode_file.abs_path().to_owned() } else { return_errno!(EBADF, "not an inode file"); } diff --git a/src/libos/src/fs/fs_view.rs b/src/libos/src/fs/fs_view.rs index f9c0d09b..88361fb9 100644 --- a/src/libos/src/fs/fs_view.rs +++ b/src/libos/src/fs/fs_view.rs @@ -143,7 +143,11 @@ impl FsView { /// Lookup INode from the cwd of the process. If path is a symlink, do not dereference it pub fn lookup_inode_no_follow(&self, path: &str) -> Result> { - debug!("lookup_inode: cwd: {:?}, path: {:?}", self.cwd(), path); + debug!( + "lookup_inode_no_follow: cwd: {:?}, path: {:?}", + self.cwd(), + path + ); let (dir_path, file_name) = split_path(&path); let dir_inode = self.lookup_inode(dir_path)?; Ok(dir_inode.lookup(file_name)?) @@ -154,11 +158,7 @@ impl FsView { // Linux uses 40 as the upper limit for resolving symbolic links, // so Occlum use it as a reasonable value const MAX_SYMLINKS: usize = 40; - debug!( - "lookup_inode_follow: cwd: {:?}, path: {:?}", - self.cwd(), - path - ); + debug!("lookup_inode: cwd: {:?}, path: {:?}", self.cwd(), path); if path.len() > 0 && path.as_bytes()[0] == b'/' { // absolute path let abs_path = path.trim_start_matches('/'); diff --git a/src/libos/src/fs/inode_file.rs b/src/libos/src/fs/inode_file.rs index 5c064247..f2cf9ba0 100644 --- a/src/libos/src/fs/inode_file.rs +++ b/src/libos/src/fs/inode_file.rs @@ -149,11 +149,11 @@ impl File for INodeFile { Ok(name) } - fn get_access_mode(&self) -> Result { + fn access_mode(&self) -> Result { Ok(self.access_mode.clone()) } - fn get_status_flags(&self) -> Result { + fn status_flags(&self) -> Result { let status_flags = self.status_flags.read().unwrap(); Ok(status_flags.clone()) } @@ -238,7 +238,7 @@ impl INodeFile { }) } - pub fn get_abs_path(&self) -> &str { + pub fn abs_path(&self) -> &str { &self.abs_path } } diff --git a/src/libos/src/fs/pipe.rs b/src/libos/src/fs/pipe.rs index 4a451201..5fa195fa 100644 --- a/src/libos/src/fs/pipe.rs +++ b/src/libos/src/fs/pipe.rs @@ -44,11 +44,11 @@ impl File for PipeReader { self.consumer.pop_slices(bufs) } - fn get_access_mode(&self) -> Result { + fn access_mode(&self) -> Result { Ok(AccessMode::O_RDONLY) } - fn get_status_flags(&self) -> Result { + fn status_flags(&self) -> Result { let status_flags = self.status_flags.load(Ordering::Acquire); Ok(status_flags.clone()) } @@ -107,11 +107,11 @@ impl File for PipeWriter { return_errno!(ESPIPE, "Pipe does not support seek") } - fn get_access_mode(&self) -> Result { + fn access_mode(&self) -> Result { Ok(AccessMode::O_WRONLY) } - fn get_status_flags(&self) -> Result { + fn status_flags(&self) -> Result { let status_flags = self.status_flags.load(Ordering::Acquire); Ok(status_flags.clone()) } diff --git a/src/libos/src/fs/stdio.rs b/src/libos/src/fs/stdio.rs index cec40758..13783d12 100644 --- a/src/libos/src/fs/stdio.rs +++ b/src/libos/src/fs/stdio.rs @@ -96,7 +96,7 @@ impl StdoutFile { } } - fn get_host_fd(&self) -> FileDesc { + fn host_fd(&self) -> FileDesc { self.host_fd } } @@ -181,7 +181,7 @@ impl File for StdoutFile { let cmd_bits = cmd.cmd_num() as c_int; let cmd_arg_ptr = cmd.arg_ptr() as *mut c_void; - let host_stdout_fd = self.get_host_fd() as i32; + let host_stdout_fd = self.host_fd() as i32; let cmd_arg_len = cmd.arg_len(); let ret = try_libc!({ let mut retval: i32 = 0; @@ -258,7 +258,7 @@ impl StdinFile { } } - fn get_host_fd(&self) -> FileDesc { + fn host_fd(&self) -> FileDesc { self.host_fd } } @@ -330,7 +330,7 @@ impl File for StdinFile { let cmd_bits = cmd.cmd_num() as c_int; let cmd_arg_ptr = cmd.arg_ptr() as *mut c_void; - let host_stdin_fd = self.get_host_fd() as i32; + let host_stdin_fd = self.host_fd() as i32; let cmd_arg_len = cmd.arg_len(); let ret = try_libc!({ let mut retval: i32 = 0; diff --git a/src/libos/src/net/io_multiplexing/poll.rs b/src/libos/src/net/io_multiplexing/poll.rs index 60f6b184..655544e6 100644 --- a/src/libos/src/net/io_multiplexing/poll.rs +++ b/src/libos/src/net/io_multiplexing/poll.rs @@ -116,7 +116,7 @@ pub fn do_poll(pollfds: &mut [PollEvent], timeout: *mut timeval_t) -> Result Result Result { + fn access_mode(&self) -> Result { Ok(AccessMode::O_RDWR) } - fn get_status_flags(&self) -> Result { + fn status_flags(&self) -> Result { let ret = try_libc!(libc::ocall::fcntl_arg0( self.raw_host_fd() as i32, libc::F_GETFL diff --git a/src/libos/src/net/socket/unix/stream/file.rs b/src/libos/src/net/socket/unix/stream/file.rs index 99c974d5..171ad8ef 100644 --- a/src/libos/src/net/socket/unix/stream/file.rs +++ b/src/libos/src/net/socket/unix/stream/file.rs @@ -60,11 +60,11 @@ impl File for Stream { } } - fn get_access_mode(&self) -> Result { + fn access_mode(&self) -> Result { Ok(AccessMode::O_RDWR) } - fn get_status_flags(&self) -> Result { + fn status_flags(&self) -> Result { if self.nonblocking() { Ok(StatusFlags::O_NONBLOCK) } else { diff --git a/src/libos/src/vm/vm_manager.rs b/src/libos/src/vm/vm_manager.rs index 4a99fbc0..49d3d996 100644 --- a/src/libos/src/vm/vm_manager.rs +++ b/src/libos/src/vm/vm_manager.rs @@ -603,7 +603,7 @@ impl VMManager { Some((file_and_offset)) => file_and_offset, }; let file_writable = file - .get_access_mode() + .access_mode() .map(|ac| ac.writable()) .unwrap_or_default(); if !file_writable {