foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-01-03 04:48:52 -05:00
Code Issues Packages 1 Wiki Activity

fix(core): deflake WASM termination test (#15103)

Browse source
This commit is contained in:
Bartek Iwańczuk 2022-07-07 16:28:29 +02:00 committed by GitHub
parent 82f7daeed7
commit 870eb0df81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/runtime.rs
View file

@ -2307,23 +2307,13 @@ pub mod tests {
#[test] #[test]
fn terminate_execution_webassembly() { fn terminate_execution_webassembly() {
let (mut isolate, _dispatch_count) = setup(Mode::Async); let (mut runtime, _dispatch_count) = setup(Mode::Async);
let v8_isolate_handle = isolate.v8_isolate().thread_safe_handle(); let v8_isolate_handle = runtime.v8_isolate().thread_safe_handle();
let terminator_thread = std::thread::spawn(move || {
// allow deno to boot and run
std::thread::sleep(std::time::Duration::from_millis(1000));
// terminate execution
let ok = v8_isolate_handle.terminate_execution();
assert!(ok);
});
// Run an infinite loop in Webassemby code, which should be terminated. // Run an infinite loop in Webassemby code, which should be terminated.
isolate.execute_script("infinite_wasm_loop.js", let promise = runtime.execute_script("infinite_wasm_loop.js",
r#" r#"
(async () => { (async () => {
console.log("Begin");
const wasmCode = new Uint8Array([ const wasmCode = new Uint8Array([
0, 97, 115, 109, 1, 0, 0, 0, 1, 4, 1, 0, 97, 115, 109, 1, 0, 0, 0, 1, 4, 1,
96, 0, 0, 3, 2, 1, 0, 7, 17, 1, 13, 96, 0, 0, 3, 2, 1, 0, 7, 17, 1, 13,
@ -2332,23 +2322,31 @@ pub mod tests {
12, 0, 11, 11, 12, 0, 11, 11,
]); ]);
const wasmModule = await WebAssembly.compile(wasmCode); const wasmModule = await WebAssembly.compile(wasmCode);
const wasmInstance = new WebAssembly.Instance(wasmModule); globalThis.wasmInstance = new WebAssembly.Instance(wasmModule);
wasmInstance.exports.infinite_loop(); })()
})(); "#).unwrap();
"#).expect("wasm infinite loop failed"); futures::executor::block_on(runtime.resolve_value(promise)).unwrap();
match futures::executor::block_on(isolate.run_event_loop(false)) { let terminator_thread = std::thread::spawn(move || {
Ok(_) => panic!("execution should be terminated"), std::thread::sleep(std::time::Duration::from_millis(1000));
Err(e) => {
assert_eq!(e.to_string(), "Uncaught Error: execution terminated") // terminate execution
} let ok = v8_isolate_handle.terminate_execution();
} assert!(ok);
});
let err = runtime
.execute_script(
"infinite_wasm_loop2.js",
"globalThis.wasmInstance.exports.infinite_loop();",
)
.unwrap_err();
assert_eq!(err.to_string(), "Uncaught Error: execution terminated");
// Cancel the execution-terminating exception in order to allow script // Cancel the execution-terminating exception in order to allow script
// execution again. // execution again.
let ok = isolate.v8_isolate().cancel_terminate_execution(); let ok = runtime.v8_isolate().cancel_terminate_execution();
assert!(ok); assert!(ok);
// Verify that the isolate usable again. // Verify that the isolate usable again.
isolate runtime
.execute_script("simple.js", "1 + 1") .execute_script("simple.js", "1 + 1")
.expect("execution should be possible again"); .expect("execution should be possible again");