mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 05:38:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid deadlocks in emscripten dyn calls

Browse Source 
Do not hold locks on EmEnv's EmscriptenData into the actual call into the module
This commit is contained in:
Julius Michaelis
2022-01-27 23:06:35 +09:00
parent 75cfdaa6ca
commit 24abeccccb
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/emscripten/src/emscripten_target.rs
View File

@@ -140,8 +140,8 @@ pub fn _getnameinfo(
macro_rules! invoke { macro_rules! invoke {
($ctx: ident, $name:ident, $name_ref:ident, $( $arg:ident ),*) => {{ ($ctx: ident, $name:ident, $name_ref:ident, $( $arg:ident ),*) => {{
let sp = get_emscripten_data($ctx).stack_save_ref().expect("stack_save is None").call().expect("stack_save call failed"); let sp = get_emscripten_data($ctx).stack_save_ref().expect("stack_save is None").call().expect("stack_save call failed");
let result = get_emscripten_data($ctx).$name_ref().expect(concat!("Dynamic call is None: ", stringify!($name))).call($($arg),*); let call = get_emscripten_data($ctx).$name_ref().expect(concat!("Dynamic call is None: ", stringify!($name))).clone();
match result { match call.call($($arg),*) {
Ok(v) => v, Ok(v) => v,
Err(_e) => { Err(_e) => {
get_emscripten_data($ctx).stack_restore_ref().expect("stack_restore is None").call(sp).expect("stack_restore call failed"); get_emscripten_data($ctx).stack_restore_ref().expect("stack_restore is None").call(sp).expect("stack_restore call failed");
@@ -156,8 +156,8 @@ macro_rules! invoke {
macro_rules! invoke_no_return { macro_rules! invoke_no_return {
($ctx: ident, $name:ident, $name_ref:ident, $( $arg:ident ),*) => {{ ($ctx: ident, $name:ident, $name_ref:ident, $( $arg:ident ),*) => {{
let sp = get_emscripten_data($ctx).stack_save_ref().expect("stack_save is None").call().expect("stack_save call failed"); let sp = get_emscripten_data($ctx).stack_save_ref().expect("stack_save is None").call().expect("stack_save call failed");
let result = get_emscripten_data($ctx).$name_ref().expect(concat!("Dynamic call is None: ", stringify!($name))).call($($arg),*); let call = get_emscripten_data($ctx).$name_ref().expect(concat!("Dynamic call is None: ", stringify!($name))).clone();
match result { match call.call($($arg),*) {
Ok(v) => v, Ok(v) => v,
Err(_e) => { Err(_e) => {
get_emscripten_data($ctx).stack_restore_ref().expect("stack_restore is None").call(sp).expect("stack_restore call failed"); get_emscripten_data($ctx).stack_restore_ref().expect("stack_restore is None").call(sp).expect("stack_restore call failed");
@@ -171,11 +171,9 @@ macro_rules! invoke_no_return {
// The invoke_j functions do not save the stack // The invoke_j functions do not save the stack
macro_rules! invoke_no_stack_save { macro_rules! invoke_no_stack_save {
($ctx: ident, $name:ident, $name_ref:ident, $( $arg:ident ),*) => {{ ($ctx: ident, $name:ident, $name_ref:ident, $( $arg:ident ),*) => {{
if let Some(call) = get_emscripten_data($ctx).$name_ref() { let call = get_emscripten_data($ctx).$name_ref().expect(concat!(stringify!($name), " is set to None")).clone();
call.call($($arg),*).unwrap()
} else { call.call($($arg),*).unwrap()
panic!("{} is set to None", stringify!($name));
}
}} }}
} }