mikros/proc_man
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: mikros:83d19db6389caa1e57f85ed8be792cf9c8076052
Branches Tags
mikros:master
..
compare: mikros:c6c2136a9f30f431fb503b6e8d8b077f27681da8
Branches Tags
mikros:master

No commits in common. "83d19db6389caa1e57f85ed8be792cf9c8076052" and "c6c2136a9f30f431fb503b6e8d8b077f27681da8" have entirely different histories.
83d19db638 ... c6c2136a9f

1 changed files with 23 additions and 62 deletions
Show Stats Expand all files Collapse all files

73
src/main.rs
View File

@ -1,7 +1,4 @@
use std::{
collections::HashMap,
os::mikros::{self, ipc, syscalls, Errno},
};
use std::{collections::HashMap, os::mikros::{self, ipc, syscalls, Errno}};
use parking_lot::RwLock;
@ -25,57 +22,38 @@ struct Serv {
impl proc_man_rpc::Server for Serv {
fn new_proc(&self, pid: u64, parent: Option<u64>) -> Result<(), Errno> {
self.processes.write().insert(
pid,
Process {
let syslog_pid = syscalls::try_get_registered(2).unwrap();
let syslog_client = syslog_rpc::Client::new(syslog_pid);
syslog_client.send_text_message("proc_man", format!("Process {pid} created with parent {parent:?}")).unwrap();
self.processes.write().insert(pid, Process {
stdio: [None; 3],
cli_args: Vec::new(),
status: ProcessStatus::Running,
parent,
children: Vec::new(),
},
);
});
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(())
}
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(())
}
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> {
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(())
}
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) {
@ -100,16 +78,8 @@ impl proc_man_rpc::Server for Serv {
if let ProcessStatus::Exited(code) = proc_status {
self.processes.write().remove(&pid);
syscalls::clear_exited(pid).unwrap();
self.processes
.write()
.get_mut(&from)
.unwrap()
.children
.retain(|&child| child != pid);
return Ok(proc_man_rpc::WaitResult {
pid,
exit_code: code,
});
self.processes.write().get_mut(&from).unwrap().children.retain(|&child| child != pid);
return Ok(proc_man_rpc::WaitResult { pid, exit_code: code });
};
}
std::mem::drop(processes);
@ -124,16 +94,8 @@ impl proc_man_rpc::Server for Serv {
if let ProcessStatus::Exited(code) = proc_status {
self.processes.write().remove(&pid);
syscalls::clear_exited(pid).unwrap();
self.processes
.write()
.get_mut(&from)
.unwrap()
.children
.retain(|&child| child != pid);
return Ok(proc_man_rpc::WaitResult {
pid,
exit_code: code,
});
self.processes.write().get_mut(&from).unwrap().children.retain(|&child| child != pid);
return Ok(proc_man_rpc::WaitResult { pid, exit_code: code });
};
if !block {
return Err(Errno::EAGAIN);
@ -142,6 +104,7 @@ impl proc_man_rpc::Server for Serv {
}
}
}
}
fn main() {
@ -156,9 +119,7 @@ fn main() {
};
proc_man_rpc::register_server(Box::new(serv));
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 {
ipc::process_messages();
}