shutting down IPC router thread when a process shuts down.

servo · Mar 30, 2020 · 53497fe · 53497fe
1 parent 67b4336
commit 53497fe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
@@ -2833,6 +2833,9 @@ where
         debug!("Asking compositor to complete shutdown.");
         self.compositor_proxy
             .send(ToCompositorMsg::ShutdownComplete);
+
+        debug!("Shutting-down IPC router thread in constellation.");
+        ROUTER.shutdown();
     }
 
     fn handle_pipeline_exited(&mut self, pipeline_id: PipelineId) {

diff --git a/components/script/script_thread.rs b/components/script/script_thread.rs
@@ -145,6 +145,7 @@ use script_traits::{ScriptToConstellationChan, TimerSchedulerMsg};
 use script_traits::{TouchEventType, TouchId, UntrustedNodeAddress, WheelDelta};
 use script_traits::{UpdatePipelineIdReason, WebrenderIpcSender, WindowSizeData, WindowSizeType};
 use servo_atoms::Atom;
+use servo_config::opts;
 use servo_url::{ImmutableOrigin, MutableOrigin, ServoUrl};
 use std::borrow::Cow;
 use std::cell::Cell;
@@ -2908,6 +2909,12 @@ impl ScriptThread {
             .as_ref()
             .map(|bhm| bhm.unregister());
 
+        // If we're in multiprocess mode, shut-down the IPC router for this process.
+        if opts::multiprocess() {
+            debug!("Exiting IPC router thread in script thread.");
+            ROUTER.shutdown();
+        }
+
         debug!("Exited script thread.");
     }