move fd table to crates and update rust-fatfs #99
Conversation
crates/ruxfdtable/src/lib.rs
Outdated
| ///Rust version for struct timespec in ctypes. Represents a high-resolution time specification. | ||
| pub struct rux_timespec { | ||
| /// Whole seconds part of the timespec. | ||
| pub tv_sec: ::core::ffi::c_longlong, |
crates/ruxfdtable/src/lib.rs
Outdated
|
|
||
| ///Rust version for struct stat in ctypes. Represents file status information. | ||
| #[cfg(target_arch = "aarch64")] | ||
| pub struct Ruxstat { |
There was a problem hiding this comment.
Use RuxStat. Structure names should follow Rust rules(Upper camel case).
modules/ruxtask/src/run_queue.rs
Outdated
| @@ -202,8 +204,20 @@ impl AxRunQueue { | |||
| } | |||
| } | |||
|
|
|||
| fn gc_flush_file(fd: usize) -> LinuxResult { | |||
| info!("lhw debug gc flush"); | |||
There was a problem hiding this comment.
remove this or change into trace!("gc task flush: {}", fd)
modules/ruxtask/src/run_queue.rs
Outdated
| fn gc_entry() { | ||
| let mut now_file_fd: usize = 0; |
There was a problem hiding this comment.
It is better to ignore stdin, stdout, stderr. (Start from 3)
crates/ruxfdtable/src/lib.rs
Outdated
| use spin::RwLock; | ||
|
|
||
| ///Rust version for struct timespec in ctypes. Represents a high-resolution time specification. | ||
| pub struct rux_timespec { |
There was a problem hiding this comment.
Follow upper camel case: RuxTimeSpec
| FD_TABLE.write().add_at(0, Arc::new(stdin()) as _).unwrap(); // stdin | ||
| FD_TABLE.write().add_at(1, Arc::new(stdout()) as _).unwrap(); // stdout | ||
| FD_TABLE.write().add_at(2, Arc::new(stdout()) as _).unwrap(); // stderr | ||
| 0 |
There was a problem hiding this comment.
When does this initialization take effect? This should be put into another place (Like ruxruntime or somewhere).
lhw2002426
force-pushed
the
fs
branch
2 times, most recently
from
f609271
to
ce21441
Compare
|
|
||
| ///Rust version for struct stat in ctypes. Represents file status information. | ||
| #[cfg(target_arch = "aarch64")] | ||
| pub struct RuxStat { |
There was a problem hiding this comment.
A question about the struct RuxStat: why this variable need different versions for different arch?
There was a problem hiding this comment.
I think it is possible to use #[cfg(...)] inside the struct rather than two standalone defination if a little difference exists.
There was a problem hiding this comment.
Some of the fields, like st_nlink's type is different, and some fields' order is different. So here two different structs are maintained. But it is possible to make it concise: use #[cfg(...)] for st_nlink and __unused, re-order the fields when transferring to C struct.
There was a problem hiding this comment.
Some of the fields, like
st_nlink's type is different, and some fields' order is different. So here two different structs are maintained. But it is possible to make it concise: use#[cfg(...)]forst_nlinkand__unused, re-order the fields when transferring to C struct.
Thanks, I understand now. If the difference is the order of field, using #[cfg(...)] might make code messy. I think it will be okay to keep the code as it is now.
modules/ruxfdtable/Cargo.toml
Outdated
| edition = "2021" | ||
| authors = ["HaoWen Liu <lhw2002426@stu.pku.edu.cn>"] | ||
| description = "fd table for ruxos file system" | ||
| license = "GPL-3.0-or-later OR Apache-2.0" |
modules/ruxfdtable/src/lib.rs
Outdated
| lazy_static::lazy_static! { | ||
| /// Global file descriptor table protected by a read-write lock. | ||
| pub static ref FD_TABLE: RwLock<FlattenObjects<Arc<dyn FileLike>, RUX_FILE_LIMIT>> = { | ||
| let mut fd_table = FlattenObjects::new(); |
There was a problem hiding this comment.
fd_table does not need to be mutable here.
api/ruxos_posix_api/src/imp/fs.rs
Outdated
| @@ -197,7 +208,8 @@ pub fn sys_open(filename: *const c_char, flags: c_int, mode: ctypes::mode_t) -> | |||
| syscall_body!(sys_open, { | |||
| let options = flags_to_options(flags, mode); | |||
| let file = ruxfs::fops::File::open(filename?, &options)?; | |||
| File::new(file).add_to_fd_table() | |||
| let res = File::new(file).add_to_fd_table(); | |||
| res | |||
api/ruxos_posix_api/src/imp/fs.rs
Outdated
| @@ -227,7 +239,8 @@ pub fn sys_openat(fd: usize, path: *const c_char, flags: c_int, mode: ctypes::mo | |||
| .lock() | |||
| .open_file_at(path?, &options)? | |||
| }; | |||
| File::new(file).add_to_fd_table() | |||
| let res = File::new(file).add_to_fd_table(); | |||
No description provided.