This commit is contained in:
pjht 2024-11-08 14:09:52 -06:00
parent 4336130353
commit 83d19db638
Signed by: pjht
GPG Key ID: CA239FC6934E6F3A

View File

@ -1,4 +1,7 @@
use std::{collections::HashMap, os::mikros::{self, ipc, syscalls, Errno}}; use std::{
collections::HashMap,
os::mikros::{self, ipc, syscalls, Errno},
};
use parking_lot::RwLock; use parking_lot::RwLock;
@ -22,35 +25,57 @@ struct Serv {
impl proc_man_rpc::Server for Serv { impl proc_man_rpc::Server for Serv {
fn new_proc(&self, pid: u64, parent: Option<u64>) -> Result<(), Errno> { fn new_proc(&self, pid: u64, parent: Option<u64>) -> Result<(), Errno> {
self.processes.write().insert(pid, Process { self.processes.write().insert(
pid,
Process {
stdio: [None; 3], stdio: [None; 3],
cli_args: Vec::new(), cli_args: Vec::new(),
status: ProcessStatus::Running, status: ProcessStatus::Running,
parent, parent,
children: Vec::new(), children: Vec::new(),
}); },
);
if let Some(parent) = parent { if let Some(parent) = parent {
self.processes.write().get_mut(&parent).unwrap().children.push(pid); self.processes
.write()
.get_mut(&parent)
.unwrap()
.children
.push(pid);
}; };
Ok(()) Ok(())
} }
fn set_stdio(&self, pid: u64, stdio: [Option<(u64, u64)>; 3]) -> Result<(), Errno> { fn set_stdio(&self, pid: u64, stdio: [Option<(u64, u64)>; 3]) -> Result<(), Errno> {
self.processes.write().get_mut(&pid).ok_or(Errno::ESRCH)?.stdio = stdio; self.processes
.write()
.get_mut(&pid)
.ok_or(Errno::ESRCH)?
.stdio = stdio;
Ok(()) Ok(())
} }
fn get_stdio(&self, from: u64) -> [Option<(u64, u64)>; 3] { fn get_stdio(&self, from: u64) -> [Option<(u64, u64)>; 3] {
self.processes.read().get(&from).map_or([None; 3], |proc| proc.stdio) self.processes
.read()
.get(&from)
.map_or([None; 3], |proc| proc.stdio)
} }
fn set_cli_args(&self, pid: u64, args: Vec<String>) -> Result<(), Errno> { fn set_cli_args(&self, pid: u64, args: Vec<String>) -> Result<(), Errno> {
self.processes.write().get_mut(&pid).ok_or(Errno::ESRCH)?.cli_args = args; self.processes
.write()
.get_mut(&pid)
.ok_or(Errno::ESRCH)?
.cli_args = args;
Ok(()) Ok(())
} }
fn get_cli_args(&self, from: u64) -> Vec<String> { fn get_cli_args(&self, from: u64) -> Vec<String> {
self.processes.read().get(&from).map_or(Vec::new(), |proc| proc.cli_args.clone()) self.processes
.read()
.get(&from)
.map_or(Vec::new(), |proc| proc.cli_args.clone())
} }
fn exit(&self, from: u64, code: u8) { fn exit(&self, from: u64, code: u8) {
@ -75,8 +100,16 @@ impl proc_man_rpc::Server for Serv {
if let ProcessStatus::Exited(code) = proc_status { if let ProcessStatus::Exited(code) = proc_status {
self.processes.write().remove(&pid); self.processes.write().remove(&pid);
syscalls::clear_exited(pid).unwrap(); syscalls::clear_exited(pid).unwrap();
self.processes.write().get_mut(&from).unwrap().children.retain(|&child| child != pid); self.processes
return Ok(proc_man_rpc::WaitResult { pid, exit_code: code }); .write()
.get_mut(&from)
.unwrap()
.children
.retain(|&child| child != pid);
return Ok(proc_man_rpc::WaitResult {
pid,
exit_code: code,
});
}; };
} }
std::mem::drop(processes); std::mem::drop(processes);
@ -91,8 +124,16 @@ impl proc_man_rpc::Server for Serv {
if let ProcessStatus::Exited(code) = proc_status { if let ProcessStatus::Exited(code) = proc_status {
self.processes.write().remove(&pid); self.processes.write().remove(&pid);
syscalls::clear_exited(pid).unwrap(); syscalls::clear_exited(pid).unwrap();
self.processes.write().get_mut(&from).unwrap().children.retain(|&child| child != pid); self.processes
return Ok(proc_man_rpc::WaitResult { pid, exit_code: code }); .write()
.get_mut(&from)
.unwrap()
.children
.retain(|&child| child != pid);
return Ok(proc_man_rpc::WaitResult {
pid,
exit_code: code,
});
}; };
if !block { if !block {
return Err(Errno::EAGAIN); return Err(Errno::EAGAIN);
@ -101,7 +142,6 @@ impl proc_man_rpc::Server for Serv {
} }
} }
} }
} }
fn main() { fn main() {
@ -116,7 +156,9 @@ fn main() {
}; };
proc_man_rpc::register_server(Box::new(serv)); proc_man_rpc::register_server(Box::new(serv));
syscalls::register(3); syscalls::register(3);
syslog_client.send_text_message("proc_man", "Process manager initialized").unwrap(); syslog_client
.send_text_message("proc_man", "Process manager initialized")
.unwrap();
loop { loop {
ipc::process_messages(); ipc::process_messages();
} }