mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
Make Background Hang Monitor Optional
This is done by wrapping all channels of communication and related objects inside Option which are configured using flag inside servo_config.
This commit is contained in:
parent
ada95b9878
commit
a05553f188
9 changed files with 126 additions and 74 deletions
|
@ -137,7 +137,7 @@ pub struct LayoutThread {
|
|||
font_cache_sender: IpcSender<()>,
|
||||
|
||||
/// A means of communication with the background hang monitor.
|
||||
background_hang_monitor: Box<dyn BackgroundHangMonitor>,
|
||||
background_hang_monitor: Option<Box<dyn BackgroundHangMonitor>>,
|
||||
|
||||
/// The channel on which messages can be sent to the script thread.
|
||||
script_chan: IpcSender<ConstellationControlMsg>,
|
||||
|
@ -247,7 +247,7 @@ impl LayoutThreadFactory for LayoutThread {
|
|||
is_iframe: bool,
|
||||
chan: (Sender<Msg>, Receiver<Msg>),
|
||||
pipeline_port: IpcReceiver<LayoutControlMsg>,
|
||||
background_hang_monitor_register: Box<dyn BackgroundHangMonitorRegister>,
|
||||
background_hang_monitor_register: Option<Box<dyn BackgroundHangMonitorRegister>>,
|
||||
constellation_chan: IpcSender<ConstellationMsg>,
|
||||
script_chan: IpcSender<ConstellationControlMsg>,
|
||||
image_cache: Arc<dyn ImageCache>,
|
||||
|
@ -281,12 +281,13 @@ impl LayoutThreadFactory for LayoutThread {
|
|||
// Ensures layout thread is destroyed before we send shutdown message
|
||||
let sender = chan.0;
|
||||
|
||||
let background_hang_monitor = background_hang_monitor_register
|
||||
.register_component(
|
||||
let background_hang_monitor = background_hang_monitor_register.map(|bhm| {
|
||||
bhm.register_component(
|
||||
MonitoredComponentId(id, MonitoredComponentType::Layout),
|
||||
Duration::from_millis(1000),
|
||||
Duration::from_millis(5000),
|
||||
);
|
||||
)
|
||||
});
|
||||
|
||||
let layout = LayoutThread::new(
|
||||
id,
|
||||
|
@ -463,7 +464,7 @@ impl LayoutThread {
|
|||
is_iframe: bool,
|
||||
port: Receiver<Msg>,
|
||||
pipeline_port: IpcReceiver<LayoutControlMsg>,
|
||||
background_hang_monitor: Box<dyn BackgroundHangMonitor>,
|
||||
background_hang_monitor: Option<Box<dyn BackgroundHangMonitor>>,
|
||||
constellation_chan: IpcSender<ConstellationMsg>,
|
||||
script_chan: IpcSender<ConstellationControlMsg>,
|
||||
image_cache: Arc<dyn ImageCache>,
|
||||
|
@ -648,7 +649,8 @@ impl LayoutThread {
|
|||
Msg::GetRunningAnimations(..) => LayoutHangAnnotation::GetRunningAnimations,
|
||||
};
|
||||
self.background_hang_monitor
|
||||
.notify_activity(HangAnnotation::Layout(hang_annotation));
|
||||
.as_ref()
|
||||
.map(|bhm| bhm.notify_activity(HangAnnotation::Layout(hang_annotation)));
|
||||
}
|
||||
|
||||
/// Receives and dispatches messages from the script and constellation threads
|
||||
|
@ -660,7 +662,9 @@ impl LayoutThread {
|
|||
}
|
||||
|
||||
// Notify the background-hang-monitor we are waiting for an event.
|
||||
self.background_hang_monitor.notify_wait();
|
||||
self.background_hang_monitor
|
||||
.as_ref()
|
||||
.map(|bhm| bhm.notify_wait());
|
||||
|
||||
let request = select! {
|
||||
recv(self.pipeline_port) -> msg => Request::FromPipeline(msg.unwrap()),
|
||||
|
@ -895,7 +899,9 @@ impl LayoutThread {
|
|||
}
|
||||
|
||||
fn exit_now(&mut self) {
|
||||
self.background_hang_monitor.unregister();
|
||||
self.background_hang_monitor
|
||||
.as_ref()
|
||||
.map(|bhm| bhm.unregister());
|
||||
}
|
||||
|
||||
fn handle_add_stylesheet(&self, stylesheet: &Stylesheet, guard: &SharedRwLockReadGuard) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue