This commit includes a set of changes that add initial support for `wasi-threads` to Wasmtime:
* feat: remove mutability from the WasiCtx Table
This patch adds interior mutability to the WasiCtx Table and the Table elements.
Major pain points:
* `File` only needs `RwLock<cap_std::fs::File>` to implement
`File::set_fdflags()` on Windows, because of [1]
* Because `File` needs a `RwLock` and `RwLock*Guard` cannot
be hold across an `.await`, The `async` from
`async fn num_ready_bytes(&self)` had to be removed
* Because `File` needs a `RwLock` and `RwLock*Guard` cannot
be dereferenced in `pollable`, the signature of
`fn pollable(&self) -> Option<rustix::fd::BorrowedFd>`
changed to `fn pollable(&self) -> Option<Arc<dyn AsFd + '_>>`
[1] da238e324e/src/fs/fd_flags.rs (L210-L217)
* wasi-threads: add an initial implementation
This change is a first step toward implementing `wasi-threads` in
Wasmtime. We may find that it has some missing pieces, but the core
functionality is there: when `wasi::thread_spawn` is called by a running
WebAssembly module, a function named `wasi_thread_start` is found in the
module's exports and called in a new instance. The shared memory of the
original instance is reused in the new instance.
This new WASI proposal is in its early stages and details are still
being hashed out in the [spec] and [wasi-libc] repositories. Due to its
experimental state, the `wasi-threads` functionality is hidden behind
both a compile-time and runtime flag: one must build with `--features
wasi-threads` but also run the Wasmtime CLI with `--wasm-features
threads` and `--wasi-modules experimental-wasi-threads`. One can
experiment with `wasi-threads` by running:
```console
$ cargo run --features wasi-threads -- \
--wasm-features threads --wasi-modules experimental-wasi-threads \
<a threads-enabled module>
```
Threads-enabled Wasm modules are not yet easy to build. Hopefully this
is resolved soon, but in the meantime see the use of
`THREAD_MODEL=posix` in the [wasi-libc] repository for some clues on
what is necessary. Wiggle complicates things by requiring the Wasm
memory to be exported with a certain name and `wasi-threads` also
expects that memory to be imported; this build-time obstacle can be
overcome with the `--import-memory --export-memory` flags only available
in the latest Clang tree. Due to all of this, the included tests are
written directly in WAT--run these with:
```console
$ cargo test --features wasi-threads -p wasmtime-cli -- cli_tests
```
[spec]: https://github.com/WebAssembly/wasi-threads
[wasi-libc]: https://github.com/WebAssembly/wasi-libc
This change does not protect the WASI implementations themselves from
concurrent access. This is already complete in previous commits or left
for future commits in certain cases (e.g., wasi-nn).
* wasi-threads: factor out process exit logic
As is being discussed [elsewhere], either calling `proc_exit` or
trapping in any thread should halt execution of all threads. The
Wasmtime CLI already has logic for adapting a WebAssembly error code to
a code expected in each OS. This change factors out this logic to a new
function, `maybe_exit_on_error`, for use within the `wasi-threads`
implementation.
This will work reasonably well for CLI users of Wasmtime +
`wasi-threads`, but embedders will want something better in the future:
when a `wasi-threads` threads fails, they may not want their application
to exit. Handling this is tricky, because it will require cancelling the
threads spawned by the `wasi-threads` implementation, something that is
not trivial to do in Rust. With this change, we defer that work until
later in order to provide a working implementation of `wasi-threads` for
experimentation.
[elsewhere]: https://github.com/WebAssembly/wasi-threads/pull/17
* review: work around `fd_fdstat_set_flags`
In order to make progress with wasi-threads, this change temporarily
works around limitations induced by `wasi-common`'s
`fd_fdstat_set_flags` to allow `&mut self` use in the implementation.
Eventual resolution is tracked in
https://github.com/bytecodealliance/wasmtime/issues/5643. This change
makes several related helper functions (e.g., `set_fdflags`) take `&mut
self` as well.
* test: use `wait`/`notify` to improve `threads.wat` test
Previously, the test simply executed in a loop for some hardcoded number
of iterations. This changes uses `wait` and `notify` and atomic
operations to keep track of when the spawned threads are done and join
on the main thread appropriately.
* various fixes and tweaks due to the PR review
---------
Signed-off-by: Harald Hoyer <harald@profian.com>
Co-authored-by: Harald Hoyer <harald@profian.com>
Co-authored-by: Alex Crichton <alex@alexcrichton.com>
203 lines
6.0 KiB
Rust
203 lines
6.0 KiB
Rust
// This is mostly stubs
|
|
#![allow(unused_variables, dead_code)]
|
|
//! Virtual pipes.
|
|
//!
|
|
//! These types provide easy implementations of `WasiFile` that mimic much of the behavior of Unix
|
|
//! pipes. These are particularly helpful for redirecting WASI stdio handles to destinations other
|
|
//! than OS files.
|
|
//!
|
|
//! Some convenience constructors are included for common backing types like `Vec<u8>` and `String`,
|
|
//! but the virtual pipes can be instantiated with any `Read` or `Write` type.
|
|
//!
|
|
use crate::file::{FdFlags, FileType, WasiFile};
|
|
use crate::Error;
|
|
use std::any::Any;
|
|
use std::convert::TryInto;
|
|
use std::io::{self, Read, Write};
|
|
use std::sync::{Arc, RwLock};
|
|
|
|
/// A virtual pipe read end.
|
|
///
|
|
/// A variety of `From` impls are provided so that common pipe types are easy to create. For example:
|
|
///
|
|
/// ```no_run
|
|
/// use wasi_common::{pipe::ReadPipe, WasiCtx, Table};
|
|
/// let stdin = ReadPipe::from("hello from stdin!");
|
|
/// // Brint these instances from elsewhere (e.g. wasi-cap-std-sync):
|
|
/// let random = todo!();
|
|
/// let clocks = todo!();
|
|
/// let sched = todo!();
|
|
/// let table = Table::new();
|
|
/// let mut ctx = WasiCtx::new(random, clocks, sched, table);
|
|
/// ctx.set_stdin(Box::new(stdin.clone()));
|
|
/// ```
|
|
#[derive(Debug)]
|
|
pub struct ReadPipe<R: Read> {
|
|
reader: Arc<RwLock<R>>,
|
|
}
|
|
|
|
impl<R: Read> Clone for ReadPipe<R> {
|
|
fn clone(&self) -> Self {
|
|
Self {
|
|
reader: self.reader.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<R: Read> ReadPipe<R> {
|
|
/// Create a new pipe from a `Read` type.
|
|
///
|
|
/// All `Handle` read operations delegate to reading from this underlying reader.
|
|
pub fn new(r: R) -> Self {
|
|
Self::from_shared(Arc::new(RwLock::new(r)))
|
|
}
|
|
|
|
/// Create a new pipe from a shareable `Read` type.
|
|
///
|
|
/// All `Handle` read operations delegate to reading from this underlying reader.
|
|
pub fn from_shared(reader: Arc<RwLock<R>>) -> Self {
|
|
Self { reader }
|
|
}
|
|
|
|
/// Try to convert this `ReadPipe<R>` back to the underlying `R` type.
|
|
///
|
|
/// This will fail with `Err(self)` if multiple references to the underlying `R` exist.
|
|
pub fn try_into_inner(mut self) -> Result<R, Self> {
|
|
match Arc::try_unwrap(self.reader) {
|
|
Ok(rc) => Ok(RwLock::into_inner(rc).unwrap()),
|
|
Err(reader) => {
|
|
self.reader = reader;
|
|
Err(self)
|
|
}
|
|
}
|
|
}
|
|
fn borrow(&self) -> std::sync::RwLockWriteGuard<R> {
|
|
RwLock::write(&self.reader).unwrap()
|
|
}
|
|
}
|
|
|
|
impl From<Vec<u8>> for ReadPipe<io::Cursor<Vec<u8>>> {
|
|
fn from(r: Vec<u8>) -> Self {
|
|
Self::new(io::Cursor::new(r))
|
|
}
|
|
}
|
|
|
|
impl From<&[u8]> for ReadPipe<io::Cursor<Vec<u8>>> {
|
|
fn from(r: &[u8]) -> Self {
|
|
Self::from(r.to_vec())
|
|
}
|
|
}
|
|
|
|
impl From<String> for ReadPipe<io::Cursor<String>> {
|
|
fn from(r: String) -> Self {
|
|
Self::new(io::Cursor::new(r))
|
|
}
|
|
}
|
|
|
|
impl From<&str> for ReadPipe<io::Cursor<String>> {
|
|
fn from(r: &str) -> Self {
|
|
Self::from(r.to_string())
|
|
}
|
|
}
|
|
|
|
#[wiggle::async_trait]
|
|
impl<R: Read + Any + Send + Sync> WasiFile for ReadPipe<R> {
|
|
fn as_any(&self) -> &dyn Any {
|
|
self
|
|
}
|
|
async fn get_filetype(&self) -> Result<FileType, Error> {
|
|
Ok(FileType::Pipe)
|
|
}
|
|
async fn read_vectored<'a>(&self, bufs: &mut [io::IoSliceMut<'a>]) -> Result<u64, Error> {
|
|
let n = self.borrow().read_vectored(bufs)?;
|
|
Ok(n.try_into()?)
|
|
}
|
|
}
|
|
|
|
/// A virtual pipe write end.
|
|
///
|
|
/// ```no_run
|
|
/// use wasi_common::{pipe::WritePipe, WasiCtx, Table};
|
|
/// let stdout = WritePipe::new_in_memory();
|
|
/// // Brint these instances from elsewhere (e.g. wasi-cap-std-sync):
|
|
/// let random = todo!();
|
|
/// let clocks = todo!();
|
|
/// let sched = todo!();
|
|
/// let table = Table::new();
|
|
/// let mut ctx = WasiCtx::new(random, clocks, sched, table);
|
|
/// ctx.set_stdout(Box::new(stdout.clone()));
|
|
/// // use ctx in an instance, then make sure it is dropped:
|
|
/// drop(ctx);
|
|
/// let contents: Vec<u8> = stdout.try_into_inner().expect("sole remaining reference to WritePipe").into_inner();
|
|
/// println!("contents of stdout: {:?}", contents);
|
|
/// ```
|
|
#[derive(Debug)]
|
|
pub struct WritePipe<W: Write> {
|
|
writer: Arc<RwLock<W>>,
|
|
}
|
|
|
|
impl<W: Write> Clone for WritePipe<W> {
|
|
fn clone(&self) -> Self {
|
|
Self {
|
|
writer: self.writer.clone(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl<W: Write> WritePipe<W> {
|
|
/// Create a new pipe from a `Write` type.
|
|
///
|
|
/// All `Handle` write operations delegate to writing to this underlying writer.
|
|
pub fn new(w: W) -> Self {
|
|
Self::from_shared(Arc::new(RwLock::new(w)))
|
|
}
|
|
|
|
/// Create a new pipe from a shareable `Write` type.
|
|
///
|
|
/// All `Handle` write operations delegate to writing to this underlying writer.
|
|
pub fn from_shared(writer: Arc<RwLock<W>>) -> Self {
|
|
Self { writer }
|
|
}
|
|
|
|
/// Try to convert this `WritePipe<W>` back to the underlying `W` type.
|
|
///
|
|
/// This will fail with `Err(self)` if multiple references to the underlying `W` exist.
|
|
pub fn try_into_inner(mut self) -> Result<W, Self> {
|
|
match Arc::try_unwrap(self.writer) {
|
|
Ok(rc) => Ok(RwLock::into_inner(rc).unwrap()),
|
|
Err(writer) => {
|
|
self.writer = writer;
|
|
Err(self)
|
|
}
|
|
}
|
|
}
|
|
|
|
fn borrow(&self) -> std::sync::RwLockWriteGuard<W> {
|
|
RwLock::write(&self.writer).unwrap()
|
|
}
|
|
}
|
|
|
|
impl WritePipe<io::Cursor<Vec<u8>>> {
|
|
/// Create a new writable virtual pipe backed by a `Vec<u8>` buffer.
|
|
pub fn new_in_memory() -> Self {
|
|
Self::new(io::Cursor::new(vec![]))
|
|
}
|
|
}
|
|
|
|
#[wiggle::async_trait]
|
|
impl<W: Write + Any + Send + Sync> WasiFile for WritePipe<W> {
|
|
fn as_any(&self) -> &dyn Any {
|
|
self
|
|
}
|
|
async fn get_filetype(&self) -> Result<FileType, Error> {
|
|
Ok(FileType::Pipe)
|
|
}
|
|
async fn get_fdflags(&self) -> Result<FdFlags, Error> {
|
|
Ok(FdFlags::APPEND)
|
|
}
|
|
async fn write_vectored<'a>(&self, bufs: &[io::IoSlice<'a>]) -> Result<u64, Error> {
|
|
let n = self.borrow().write_vectored(bufs)?;
|
|
Ok(n.try_into()?)
|
|
}
|
|
}
|