Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Shut down servo when the ML app quits

Browse source
This commit is contained in:
Alan Jeffrey 2018-11-02 10:57:26 -05:00
parent 95bfaa0a77
commit 57085eea6a
2 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ports/libmlservo/src/lib.rs
View file

@ -43,6 +43,9 @@ use std::os::raw::c_char;
use std::os::raw::c_void;
use std::path::PathBuf;
use std::rc::Rc;
use std::thread;
use std::time::Duration;
use std::time::Instant;
#[repr(u32)]
pub enum MLLogLevel {
@ -221,11 +224,25 @@ pub unsafe extern "C" fn navigate_servo(servo: *mut ServoInstance, text: *const
}
}
// Some magic numbers for shutdown
const SHUTDOWN_DURATION: Duration = Duration::from_secs(10);
const SHUTDOWN_POLL_INTERVAL: Duration = Duration::from_millis(100);
#[no_mangle]
pub unsafe extern "C" fn discard_servo(servo: *mut ServoInstance) {
// Servo drop goes here!
if !servo.is_null() {
Box::from_raw(servo);
if let Some(servo) = servo.as_mut() {
let mut servo = Box::from_raw(servo);
let finish = Instant::now() + SHUTDOWN_DURATION;
'outer: while Instant::now() < finish {
servo.servo.handle_events(vec![WindowEvent::Quit]);
for (_, msg) in servo.servo.get_events() {
if let EmbedderMsg::Shutdown = msg {
break 'outer;
}
}
thread::sleep(SHUTDOWN_POLL_INTERVAL);
}
servo.servo.deinit();
}
}

4
support/magicleap/Servo2D/code/src/Servo2D.cpp
View file

@ -58,8 +58,6 @@ Servo2D::Servo2D() {
// Destroy a Servo 2D instance
Servo2D::~Servo2D() {
ML_LOG(Debug, "Servo2D Destructor.");
discard_servo(servo_);
servo_ = nullptr;
}
// The prism dimensions
@ -167,6 +165,8 @@ int Servo2D::init() {
int Servo2D::deInit() {
ML_LOG(Debug, "Servo2D Deinitializing.");
discard_servo(servo_);
servo_ = nullptr;
return 0;
}