mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-23 08:03:22 +00:00
* 添加新版pcb的数据结构 (#273) * 将pcb中的内容分类,分别加锁 (#305) * 进程管理重构:完成fork的主体逻辑 (#309) 1.完成fork的主体逻辑 2.将文件系统接到新的pcb上 3.经过思考,暂时弃用signal机制,待进程管理重构完成后,重写signal机制.原因是原本的signal机制太烂了 * chdir getcwd pid pgid ppid (#310) --------- Co-authored-by: longjin <longjin@RinGoTek.cn> * 删除旧的fork以及signal的代码,并调整fork/vfork/execve系统调用 (#325) 1.删除旧的fork 2.删除signal相关代码,等进程管理重构结束之后,再重新写. 3.调整了fork/vfork/execve系统调用 * 实现切换进程的代码 (#331) * 实现切换进程的代码 * Patch modify preempt (#332) * 修改设置preempt的代码 * 删除rust的list和refcount * 为每个核心初始化idle进程 (#333) * 为每个核心初始化idle进程 * 完成了新的内核线程机制 (#335) * 调度器的pcb替换为新的Arc<ProcessControlBlock>,把调度器队列锁从 RwSpinLock 替换为了 SpinLock (#336) * 把调度器的pcb替换为新的Arc<ProcessControlBlock> * 把调度器队列锁从 RwSpinLock 替换为了 SpinLock ,修改了签名以通过编译 * 修正一些双重加锁、细节问题 --------- Co-authored-by: longjin <longjin@RinGoTek.cn> * github workflow自动检查代码是否格式化 * cache toolchain yml * 调整rust版本的waitqueue中的pcb为新版的pcb (#343) * 解决设置rust workspace带来的“工具链不一致”的问题 (#344) * 解决设置rust workspace带来的“工具链不一致”的问题 更改workflow * 调整pcb的sched_info和rwlock,以避免调度器死锁问题 (#341) * 调整pcb的sched_info和rwlock,以避免调度器死锁问题 * 修改为在 WriterGuard 中维护 Irq_guard * 修正了 write_irqsave方法 * 优化了代码 * 把 set state 操作从 wakup 移动到 sched_enqueue 中 * 修正为在 wakeup 中设置 running ,以保留 set_state 的私有性 * 移除了 process_wakeup * 实现进程退出的逻辑 (#340) 实现进程退出的逻辑 * 标志进程sleep * 修复wakeup的问题 --------- Co-authored-by: longjin <longjin@RinGoTek.cn> * rust 重构 completion (#350) * 完成了completion的基本结构,待完善上级调用 * 用SpinLock保护结构体并发安全 * 修改原子变量为u32,修复符号错误 * irq guard * 修改为具有内部可变性的结构体 * temp fix * 修复了由于进程持有自旋锁导致的不被调度的问题 * 对 complete 系列方法上锁,保护 done 数据并发安全 * 移除了未使用的依赖 * 重写显示刷新驱动 (#363) * 重构显示刷新驱动 * Patch refactor process management (#366) * 维护进程树 * 维护进程树 * 更改代码结构 * 新建进程时,设置cwd * 调整adopt childern函数,降低开销 --------- Co-authored-by: longjin <longjin@RinGoTek.cn> * waitqueue兼容C部分 (#351) * PATH * safe init * waitqueue兼容C部分 * waitqueue兼容C部分 * 删除semaphore.c,在ps2_keyboard中使用waitqueue * 删除semaphore.c,在ps2_keyboard中使用waitqueue * current_pcb的C兼容 * current_pcb的C兼容 * current_pcb的C兼容 * fmt * current_pcb的兼容 * 针对修改 * 调整代码 * fmt * 删除pcb的set flags * 更改函数名 --------- Co-authored-by: longjin <longjin@RinGoTek.cn> * merge master * Patch debug process management refactor (#372) * 能够调通,执行完textui_init * 能跑到initial kernel thread * fmt * 能够正常初始化所有服务(尚未能切换到用户程序) * 删除部分无用的extern * 存在问题:ap处理器启动后,bsp的smp_init函数return之后就出错了,怀疑是栈损坏 * 解决smp启动由于未换栈导致的内存访问错误 * debug * 1 * 1 * lock no preempt * 调通 * 优化代码,删除一些调试日志 * fix * 使用rust重写wait4 (#377) * 维护进程树 * 维护进程树 * 更改代码结构 * 新建进程时,设置cwd * 调整adopt childern函数,降低开销 * wait4 * 删除c_sys_wait4 * 使用userbuffer保护裸指针 --------- Co-authored-by: longjin <longjin@RinGoTek.cn> * 消除warning * 1. 修正未设置cpu executing的问题 * 修正kthread机制可能存在的内存泄露问题 * 删除pcb文档 * 删除C的tss struct --------- Co-authored-by: Bullet <93781792+GP-Bullet@users.noreply.github.com> Co-authored-by: Chiichen <39649411+Chiichen@users.noreply.github.com> Co-authored-by: hanjiezhou <zhouhanjie@dragonos.org> Co-authored-by: GnoCiYeH <118462160+GnoCiYeH@users.noreply.github.com> Co-authored-by: houmkh <1119644616@qq.com>
166 lines
5.3 KiB
Rust
166 lines
5.3 KiB
Rust
use core::ffi::c_void;
|
||
|
||
use alloc::{string::String, vec::Vec};
|
||
|
||
use super::{fork::CloneFlags, Pid, ProcessManager, ProcessState};
|
||
use crate::{
|
||
arch::{interrupt::TrapFrame, sched::sched, CurrentIrqArch},
|
||
exception::InterruptArch,
|
||
filesystem::vfs::MAX_PATHLEN,
|
||
process::ProcessControlBlock,
|
||
syscall::{
|
||
user_access::{
|
||
check_and_clone_cstr, check_and_clone_cstr_array, UserBufferReader, UserBufferWriter,
|
||
},
|
||
Syscall, SystemError,
|
||
},
|
||
};
|
||
|
||
impl Syscall {
|
||
pub fn fork(frame: &mut TrapFrame) -> Result<usize, SystemError> {
|
||
let r = ProcessManager::fork(frame, CloneFlags::empty()).map(|pid| pid.into());
|
||
return r;
|
||
}
|
||
|
||
pub fn vfork(frame: &mut TrapFrame) -> Result<usize, SystemError> {
|
||
ProcessManager::fork(
|
||
frame,
|
||
CloneFlags::CLONE_VM | CloneFlags::CLONE_FS | CloneFlags::CLONE_SIGNAL,
|
||
)
|
||
.map(|pid| pid.into())
|
||
}
|
||
|
||
pub fn execve(
|
||
path: *const u8,
|
||
argv: *const *const u8,
|
||
envp: *const *const u8,
|
||
frame: &mut TrapFrame,
|
||
) -> Result<(), SystemError> {
|
||
// kdebug!(
|
||
// "execve path: {:?}, argv: {:?}, envp: {:?}\n",
|
||
// path,
|
||
// argv,
|
||
// envp
|
||
// );
|
||
if path.is_null() {
|
||
return Err(SystemError::EINVAL);
|
||
}
|
||
|
||
let x = || {
|
||
let path: String = check_and_clone_cstr(path, Some(MAX_PATHLEN))?;
|
||
let argv: Vec<String> = check_and_clone_cstr_array(argv)?;
|
||
let envp: Vec<String> = check_and_clone_cstr_array(envp)?;
|
||
Ok((path, argv, envp))
|
||
};
|
||
let r: Result<(String, Vec<String>, Vec<String>), SystemError> = x();
|
||
if let Err(e) = r {
|
||
panic!("Failed to execve: {:?}", e);
|
||
}
|
||
let (path, argv, envp) = r.unwrap();
|
||
ProcessManager::current_pcb()
|
||
.basic_mut()
|
||
.set_name(ProcessControlBlock::generate_name(&path, &argv));
|
||
|
||
return Self::do_execve(path, argv, envp, frame);
|
||
}
|
||
|
||
pub fn wait4(
|
||
pid: i64,
|
||
wstatus: *mut i32,
|
||
options: i32,
|
||
rusage: *mut c_void,
|
||
) -> Result<usize, SystemError> {
|
||
let mut _rusage_buf =
|
||
UserBufferReader::new::<c_void>(rusage, core::mem::size_of::<c_void>(), true)?;
|
||
|
||
let mut wstatus_buf =
|
||
UserBufferWriter::new::<i32>(wstatus, core::mem::size_of::<i32>(), true)?;
|
||
|
||
// 暂时不支持options选项
|
||
if options != 0 {
|
||
return Err(SystemError::EINVAL);
|
||
}
|
||
|
||
let cur_pcb = ProcessManager::current_pcb();
|
||
let rd_childen = cur_pcb.children.read();
|
||
|
||
if pid > 0 {
|
||
let pid = Pid(pid as usize);
|
||
let child_pcb = rd_childen.get(&pid).ok_or(SystemError::ECHILD)?.clone();
|
||
drop(rd_childen);
|
||
|
||
// 获取退出码
|
||
if let ProcessState::Exited(status) = child_pcb.sched_info().state() {
|
||
if !wstatus.is_null() {
|
||
wstatus_buf.copy_one_to_user(&status, 0)?;
|
||
}
|
||
return Ok(pid.into());
|
||
}
|
||
// 等待指定进程
|
||
child_pcb.wait_queue.sleep();
|
||
} else if pid < -1 {
|
||
// TODO 判断是否pgid == -pid(等待指定组任意进程)
|
||
// 暂时不支持
|
||
return Err(SystemError::EINVAL);
|
||
} else if pid == 0 {
|
||
// TODO 判断是否pgid == current_pgid(等待当前组任意进程)
|
||
// 暂时不支持
|
||
return Err(SystemError::EINVAL);
|
||
} else {
|
||
// 等待任意子进程(这两)
|
||
let irq_guard = unsafe { CurrentIrqArch::save_and_disable_irq() };
|
||
for (pid, pcb) in rd_childen.iter() {
|
||
if pcb.sched_info().state().is_exited() {
|
||
if !wstatus.is_null() {
|
||
wstatus_buf.copy_one_to_user(&0, 0)?;
|
||
}
|
||
return Ok(pid.clone().into());
|
||
} else {
|
||
unsafe { pcb.wait_queue.sleep_without_schedule() };
|
||
}
|
||
}
|
||
drop(irq_guard);
|
||
sched();
|
||
}
|
||
|
||
return Ok(0);
|
||
}
|
||
|
||
/// # 退出进程
|
||
///
|
||
/// ## 参数
|
||
///
|
||
/// - status: 退出状态
|
||
pub fn exit(status: usize) -> ! {
|
||
ProcessManager::exit(status);
|
||
}
|
||
|
||
/// @brief 获取当前进程的pid
|
||
pub fn getpid() -> Result<Pid, SystemError> {
|
||
let current_pcb = ProcessManager::current_pcb();
|
||
return Ok(current_pcb.pid());
|
||
}
|
||
|
||
/// @brief 获取指定进程的pgid
|
||
///
|
||
/// @param pid 指定一个进程号
|
||
///
|
||
/// @return 成功,指定进程的进程组id
|
||
/// @return 错误,不存在该进程
|
||
pub fn getpgid(mut pid: Pid) -> Result<Pid, SystemError> {
|
||
if pid == Pid(0) {
|
||
let current_pcb = ProcessManager::current_pcb();
|
||
pid = current_pcb.pid();
|
||
}
|
||
let target_proc = ProcessManager::find(pid).ok_or(SystemError::ESRCH)?;
|
||
return Ok(target_proc.basic().pgid());
|
||
}
|
||
/// @brief 获取当前进程的父进程id
|
||
|
||
/// 若为initproc则ppid设置为0
|
||
pub fn getppid() -> Result<Pid, SystemError> {
|
||
let current_pcb = ProcessManager::current_pcb();
|
||
return Ok(current_pcb.basic().ppid());
|
||
}
|
||
}
|