DragonOS-Community/DragonOS
4
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-19 04:56:30 +00:00
Code Issues Releases Wiki Activity

Add dup,dup2 (#224)

Browse Source 
* dup,dup2

* fix: sys_dup2语义与posix不一致的问题

---------

Co-authored-by: longjin <longjin@RinGoTek.cn>
This commit is contained in:
Gou Ngai
2023-04-02 15:43:53 +08:00
committed by GitHub
parent d7b31a969f
commit 2b771e32f5
11 changed files with 166 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
kernel/src/process/process.rs
View File

@ -7,13 +7,17 @@ use alloc::boxed::Box;
use crate::{
arch::{asm::current::current_pcb, fpu::FpState},
filesystem::vfs::{file::{File, FileDescriptorVec, FileMode}, ROOT_INODE},
filesystem::vfs::{
file::{File, FileDescriptorVec, FileMode},
ROOT_INODE,
},
include::bindings::bindings::{
process_control_block, CLONE_FS, PROC_INTERRUPTIBLE,
PROC_RUNNING, PROC_STOPPED, PROC_UNINTERRUPTIBLE,
process_control_block, CLONE_FS, PROC_INTERRUPTIBLE, PROC_RUNNING, PROC_STOPPED,
PROC_UNINTERRUPTIBLE,
},
sched::core::{cpu_executing, sched_enqueue},
smp::core::{smp_get_processor_id, smp_send_reschedule}, syscall::SystemError,
smp::core::{smp_get_processor_id, smp_send_reschedule},
syscall::SystemError,
};
use super::preempt::{preempt_disable, preempt_enable};
@ -173,9 +177,12 @@ impl process_control_block {
/// @brief 申请文件描述符，并把文件对象存入其中。
///
/// @param file 要存放的文件对象
/// @param fd 如果为Some(i32)，表示指定要申请这个文件描述符，如果这个文件描述符已经被使用，那么返回EBADF
///
/// @return Ok(i32) 申请到的文件描述符编号
/// @return Err(SystemError) 申请失败，返回错误码，并且，file对象将被drop掉
pub fn alloc_fd(&mut self, file: File) -> Result<i32, SystemError> {
pub fn alloc_fd(&mut self, file: File, fd: Option<i32>) -> Result<i32, SystemError> {
// 获取pcb的文件描述符数组的引用
let fds: &mut FileDescriptorVec =
if let Some(f) = FileDescriptorVec::from_pcb(current_pcb()) {
@ -192,16 +199,28 @@ impl process_control_block {
r.unwrap()
};
// 寻找空闲的文件描述符
let mut cnt = 0;
for x in fds.fds.iter_mut() {
if fd.is_some() {
// 指定了要申请的文件描述符编号
let new_fd = fd.unwrap();
let x = &mut fds.fds[new_fd as usize];
if x.is_none() {
*x = Some(Box::new(file));
return Ok(cnt);
return Ok(new_fd);
} else {
return Err(SystemError::EBADF);
}
cnt += 1;
} else {
// 寻找空闲的文件描述符
let mut cnt = 0;
for x in fds.fds.iter_mut() {
if x.is_none() {
*x = Some(Box::new(file));
return Ok(cnt);
}
cnt += 1;
}
return Err(SystemError::ENFILE);
}
return Err(SystemError::ENFILE);
}
/// @brief 根据文件描述符序号，获取文件结构体的可变引用
@ -377,10 +396,10 @@ pub fn init_stdio() -> Result<(), SystemError> {
.expect("Init stdio: can't create stderr");
/*
按照规定，进程的文件描述符数组的前三个位置，分别是stdin, stdout, stderr
*/
assert_eq!(current_pcb().alloc_fd(stdin).unwrap(), 0);
assert_eq!(current_pcb().alloc_fd(stdout).unwrap(), 1);
assert_eq!(current_pcb().alloc_fd(stderr).unwrap(), 2);
按照规定，进程的文件描述符数组的前三个位置，分别是stdin, stdout, stderr
*/
assert_eq!(current_pcb().alloc_fd(stdin, None).unwrap(), 0);
assert_eq!(current_pcb().alloc_fd(stdout, None).unwrap(), 1);
assert_eq!(current_pcb().alloc_fd(stderr, None).unwrap(), 2);
return Ok(());
}