mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Prevent zombie processes in multi-process mode. (#36329)
This introduces a process manager that holds for each process a "lifeline": this is the receiving end of a ipc channel that is not used to send anything, but only to monitor the process presence. We turn that ipc receiver into a crossbeam one to integrate the monitoring into the constellation run loop. The sender side is made part of the initial "UnprivilegedContent" data structure sent to the new process, both for content and for service worker processes. When a process dies we currently wait() on it to let the OS do a clean shutdown. Signed-off-by: webbeef <me@webbeef.org>
This commit is contained in:
parent
c09c31ef85
commit
c7a7862574
6 changed files with 177 additions and 44 deletions
|
@ -3,6 +3,7 @@
|
|||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use ipc_channel::Error;
|
||||
use ipc_channel::ipc::IpcSender;
|
||||
use script_traits::{SWManagerSenders, ServiceWorkerManagerFactory};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use servo_config::opts::{self, Opts};
|
||||
|
@ -10,6 +11,7 @@ use servo_config::prefs;
|
|||
use servo_config::prefs::Preferences;
|
||||
use servo_url::ImmutableOrigin;
|
||||
|
||||
use crate::process_manager::Process;
|
||||
use crate::sandboxing::{UnprivilegedContent, spawn_multiprocess};
|
||||
|
||||
/// Conceptually, this is glue to start an agent-cluster for a service worker agent.
|
||||
|
@ -20,18 +22,21 @@ pub struct ServiceWorkerUnprivilegedContent {
|
|||
prefs: Box<Preferences>,
|
||||
senders: SWManagerSenders,
|
||||
origin: ImmutableOrigin,
|
||||
lifeline_sender: Option<IpcSender<()>>,
|
||||
}
|
||||
|
||||
impl ServiceWorkerUnprivilegedContent {
|
||||
pub fn new(
|
||||
senders: SWManagerSenders,
|
||||
origin: ImmutableOrigin,
|
||||
lifeline_sender: Option<IpcSender<()>>,
|
||||
) -> ServiceWorkerUnprivilegedContent {
|
||||
ServiceWorkerUnprivilegedContent {
|
||||
opts: (*opts::get()).clone(),
|
||||
prefs: Box::new(prefs::get().clone()),
|
||||
senders,
|
||||
origin,
|
||||
lifeline_sender,
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -44,7 +49,7 @@ impl ServiceWorkerUnprivilegedContent {
|
|||
}
|
||||
|
||||
/// Start the agent-cluster in it's own process.
|
||||
pub fn spawn_multiprocess(self) -> Result<(), Error> {
|
||||
pub fn spawn_multiprocess(self) -> Result<Process, Error> {
|
||||
spawn_multiprocess(UnprivilegedContent::ServiceWorker(self))
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue