Merge remote-tracking branch 'origin/master' into ux-refactor

This commit is contained in:
bunnie 2021-06-16 17:56:44 +08:00
commit 96ca0eb8a1
2 changed files with 11 additions and 0 deletions

View file

@ -1936,6 +1936,16 @@ impl SystemServices {
server.discard_messages_for_pid(target_pid);
}
}
// Now that the server has been "Disconnected", free the server entry.
for server in self.servers.iter_mut() {
if let Some(server_inner) = server {
if server_inner.pid == target_pid {
*server = None;
}
}
}
let process = self.get_process_mut(target_pid)?;
process.activate()?;
let parent_pid = process.ppid;

View file

@ -30,6 +30,7 @@ enum ExecutionType {
NonBlocking,
}
#[cfg(baremetal)]
pub fn reset_switchto_caller() {
unsafe { SWITCHTO_CALLER = None };
}