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

Use wiggle "trappable error" to implement wasi-common (#5279)

Browse Source 
* convert wasi-common from defining its own error to using wiggle trappable error

* wasi-common impl crates: switch error strategy

* wasmtime-wasi: error is trappable, and no longer requires UserErrorConversion

* docs

* typo

* readdir: windows fixes

* fix windows scheduler errors

fun fact! the Send and Recv errors here that just had a `.context` on
them were previously not being captured in the downcasting either. They
need to be traps, and would have ended up that way by ommission, but
you'd never actually know that by reading the code!
This commit is contained in:
Pat Hickey
2022-11-16 16:57:22 -08:00
committed by GitHub
parent de6e4a4e20
commit 56daa8a199
12 changed files with 461 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/wasi-common/tokio/src/sched/unix.rs
View File

@@ -6,7 +6,7 @@ use wasi_common::{
subscription::{RwEventFlags, Subscription},
Poll,
},
Context as _, Error,
Error,
};
struct FirstReady<'a, T>(Vec<Pin<Box<dyn Future<Output = T> + Send + 'a>>>);
@@ -56,12 +56,15 @@ pub async fn poll_oneoff<'a>(poll: &mut Poll<'a>) -> Result<(), Error> {
match s {
Subscription::Read(f) => {
futures.push(async move {
f.file.readable().await.context("readable future")?;
f.file
.readable()
.await
.map_err(|e| e.context("readable future"))?;
f.complete(
f.file
.num_ready_bytes()
.await
.context("read num_ready_bytes")?,
.map_err(|e| e.context("read num_ready_bytes"))?,
RwEventFlags::empty(),
);
Ok::<(), Error>(())
@@ -70,7 +73,10 @@ pub async fn poll_oneoff<'a>(poll: &mut Poll<'a>) -> Result<(), Error> {
Subscription::Write(f) => {
futures.push(async move {
f.file.writable().await.context("writable future")?;
f.file
.writable()
.await
.map_err(|e| e.context("writable future"))?;
f.complete(0, RwEventFlags::empty());
Ok(())
});