diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-18 07:14:38 -0700 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-18 07:14:38 -0700 |
commit | 693478bc91a4708921ac4d0455184909b9ac1767 (patch) | |
tree | d4e289bd2108229618beafb3359f6f5e93e03e2a | |
parent | 96a86bd952c4c0e41d6164fbd16244ea4420106a (diff) | |
parent | 243fa4f1c164c58dc3de407c8898c1b7fbd40d21 (diff) | |
download | servo-693478bc91a4708921ac4d0455184909b9ac1767.tar.gz servo-693478bc91a4708921ac4d0455184909b9ac1767.zip |
Auto merge of #10898 - asajeffrey:chaotic-even-better, r=Manishearth
In chaos-monkey mode, only keep the mozbrowser pipeline alive.
Fixes #10897
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10898)
<!-- Reviewable:end -->
-rw-r--r-- | components/constellation/constellation.rs | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs index ae2a2ca94f9..96befe8e827 100644 --- a/components/constellation/constellation.rs +++ b/components/constellation/constellation.rs @@ -1935,12 +1935,17 @@ impl<LTF: LayoutThreadFactory, STF: ScriptThreadFactory> Constellation<LTF, STF> if let Some((ref mut rng, _)) = self.random_pipeline_closure { if let Some(pipeline_id) = rng.choose(&*pipeline_ids) { if let Some(pipeline) = self.pipelines.get(pipeline_id) { - // Don't kill the root pipeline - if pipeline.parent_info.is_none() { return; } - // Note that we deliberately do not do any of the tidying up - // associated with closing a pipeline. The constellation should cope! - info!("Randomly closing pipeline {}.", pipeline_id); - pipeline.force_exit(); + // Don't kill the mozbrowser pipeline + if prefs::get_pref("dom.mozbrowser.enabled").as_boolean().unwrap_or(false) && + pipeline.parent_info.is_none() + { + info!("Not closing mozbrowser pipeline {}.", pipeline_id); + } else { + // Note that we deliberately do not do any of the tidying up + // associated with closing a pipeline. The constellation should cope! + info!("Randomly closing pipeline {}.", pipeline_id); + pipeline.force_exit(); + } } } } |