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

Convert exit into a kernel called RPC function

Browse Source
This commit is contained in:
pjht 2024-11-08 14:53:21 -06:00
parent 83d19db638
commit 03a8c6229a
Signed by: pjht
GPG Key ID: CA239FC6934E6F3A
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
proc_man_rpc/src/lib.rs
View File

@ -66,13 +66,6 @@ impl Client {
.unwrap() .unwrap()
} }
pub fn exit(&self, code: u8) {
postcard::from_bytes(
&rpc::send_call(self.0, PROTO, 4, &postcard::to_stdvec(&code).unwrap()).get_return(),
)
.unwrap()
}
pub fn wait(&self, pid: u64, block: bool) -> Result<WaitResult, Errno> { pub fn wait(&self, pid: u64, block: bool) -> Result<WaitResult, Errno> {
postcard::from_bytes( postcard::from_bytes(
&rpc::send_call(self.0, PROTO, 5, &postcard::to_stdvec(&(pid, block)).unwrap()).get_return(), &rpc::send_call(self.0, PROTO, 5, &postcard::to_stdvec(&(pid, block)).unwrap()).get_return(),
@ -109,9 +102,9 @@ fn callback(call: IncomingCall) {
let ret = postcard::to_stdvec(&server.get_cli_args(call.from)).unwrap(); let ret = postcard::to_stdvec(&server.get_cli_args(call.from)).unwrap();
call.send_return(&ret); call.send_return(&ret);
} else if call.func == 4 { } else if call.func == 4 {
let code = postcard::from_bytes(call.args()).unwrap(); let (pid, code) = postcard::from_bytes(call.args()).unwrap();
let ret = postcard::to_stdvec(&server.exit(call.from, code)).unwrap(); let _ = server.exit(pid, code);
call.send_return(&ret); //call.send_return(&ret);
} else if call.func == 5 { } else if call.func == 5 {
let (pid, block) = postcard::from_bytes(call.args()).unwrap(); let (pid, block) = postcard::from_bytes(call.args()).unwrap();
let ret = postcard::to_stdvec(&server.wait(call.from, pid, block)).unwrap(); let ret = postcard::to_stdvec(&server.wait(call.from, pid, block)).unwrap();

4
src/main.rs
View File

@ -78,8 +78,8 @@ impl proc_man_rpc::Server for Serv {
.map_or(Vec::new(), |proc| proc.cli_args.clone()) .map_or(Vec::new(), |proc| proc.cli_args.clone())
} }
fn exit(&self, from: u64, code: u8) { fn exit(&self, pid: u64, code: u8) {
if let Some(proc) = self.processes.write().get_mut(&from) { if let Some(proc) = self.processes.write().get_mut(&pid) {
proc.status = ProcessStatus::Exited(code); proc.status = ProcessStatus::Exited(code);
} }
} }