T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

run_in_dummy_executor isnt unsafe, its just a bad idea

Browse Source
This commit is contained in:
Pat Hickey
2021-05-06 16:25:12 -07:00
parent 35a9d4e3c9
commit e9f410d1db
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/wasi-common/tokio/src/lib.rs
View File

@@ -110,5 +110,5 @@ where
Fut: Future<Output = Result<T, Error>>,
T: Send + 'static,
{
tokio::task::block_in_place(move || unsafe { wiggle::run_in_dummy_executor(f()) })
tokio::task::block_in_place(move || wiggle::run_in_dummy_executor(f()))
}

2
crates/wiggle/src/lib.rs
View File

@@ -954,7 +954,7 @@ impl From<GuestError> for Trap {
}
}
pub unsafe fn run_in_dummy_executor<F: std::future::Future>(future: F) -> F::Output {
pub fn run_in_dummy_executor<F: std::future::Future>(future: F) -> F::Output {
use std::pin::Pin;
use std::task::{Context, Poll, RawWaker, RawWakerVTable, Waker};

4
crates/wiggle/wasmtime/macro/src/lib.rs
View File

@@ -320,7 +320,7 @@ fn generate_func(
let #name_ident = wasmtime::Func::wrap(
store,
move |caller: wasmtime::Caller #(, #arg_decls)*| -> Result<#ret_ty, wasmtime::Trap> {
unsafe { #rt::run_in_dummy_executor(Self::#fn_ident(&caller, &mut my_ctx.borrow_mut() #(, #arg_names)*)) }
#rt::run_in_dummy_executor(Self::#fn_ident(&caller, &mut my_ctx.borrow_mut() #(, #arg_names)*))
}
);
});
@@ -372,7 +372,7 @@ fn generate_func(
.store()
.get::<std::rc::Rc<std::cell::RefCell<#ctx_type>>>()
.ok_or_else(|| wasmtime::Trap::new("context is missing in the store"))?;
unsafe { #rt::run_in_dummy_executor(Self::#fn_ident(&caller, &mut ctx.borrow_mut() #(, #arg_names)*)) }
#rt::run_in_dummy_executor(Self::#fn_ident(&caller, &mut ctx.borrow_mut() #(, #arg_names)*))
},
);
}