Exit Android initialization loop with error when stuck

500ms is fairly arbitrary; my emulator took 35 to run that loop.
pull/16/head
Malloc Voidstar 1 year ago
parent d24d1a6a15
commit bed6cfa206
No known key found for this signature in database
GPG Key ID: C34BA7CBAF747755
  1. 8
      src/backends/android.rs

@ -4,7 +4,7 @@ use std::ffi::{CStr, CString};
use std::os::raw::c_void;
use std::sync::{Mutex, RwLock};
use std::thread;
use std::time::Duration;
use std::time::{Duration, Instant};
use jni::objects::{GlobalRef, JObject, JString};
use jni::sys::{jfloat, jint, JNI_VERSION_1_6};
@ -198,12 +198,18 @@ impl Android {
}
let tts = env.new_global_ref(tts)?;
// This hack makes my brain bleed.
const MAX_WAIT_TIME: Duration = Duration::from_millis(500);
let start = Instant::now();
// Wait a max of 500ms for initialization, then return an error to avoid hanging.
loop {
{
let pending = PENDING_INITIALIZATIONS.read().unwrap();
if !(*pending).contains(&bid) {
break;
}
if start.elapsed() > MAX_WAIT_TIME {
return Err(Error::OperationFailed);
}
}
thread::sleep(Duration::from_millis(5));
}

Loading…
Cancel
Save