Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

improve reliability of hang monitor tests

Browse source
This commit is contained in:
Gregory Terzian 2020-07-07 12:45:14 +08:00
parent 39e3beb35c
commit 256167eff2
2 changed files with 25 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/background_hang_monitor/background_hang_monitor.rs
View file

@ -33,17 +33,19 @@ impl HangMonitorRegister {
monitoring_enabled: bool,
) -> Box<dyn BackgroundHangMonitorRegister> {
let (sender, port) = unbounded();
let _ = thread::Builder::new().spawn(move || {
let mut monitor = BackgroundHangMonitorWorker::new(
constellation_chan,
control_port,
port,
monitoring_enabled,
);
while monitor.run() {
// Monitoring until all senders have been dropped...
}
});
let _ = thread::Builder::new()
.spawn(move || {
let mut monitor = BackgroundHangMonitorWorker::new(
constellation_chan,
control_port,
port,
monitoring_enabled,
);
while monitor.run() {
// Monitoring until all senders have been dropped...
}
})
.expect("Couldn't start BHM worker.");
Box::new(HangMonitorRegister {
sender,
monitoring_enabled,

18
components/background_hang_monitor/tests/hang_monitor_tests.rs
View file

@ -197,12 +197,18 @@ fn test_hang_monitoring_exit_signal() {
);
let (exit_sender, exit_receiver) = ipc::channel().expect("Failed to create IPC channel!");
// Send the exit message.
let _ = control_sender.send(BackgroundHangMonitorControlMsg::Exit(exit_sender));
if control_sender
.send(BackgroundHangMonitorControlMsg::Exit(exit_sender))
.is_ok()
{
// Assert we receive a confirmation back.
assert!(exit_receiver.recv().is_ok());
// Assert we receive a confirmation back.
assert!(exit_receiver.recv().is_ok());
// Assert we get the exit signal.
while !closing.load(Ordering::SeqCst) {}
// Assert we get the exit signal.
while !closing.load(Ordering::SeqCst) {
thread::sleep(Duration::from_millis(10));
}
}
}