Merge pull request #1949 from bytecodealliance/acf/virtual-pipes
🕳 Add virtual pipes to wasi-common
This commit is contained in:
@@ -32,7 +32,7 @@ mod poll;
|
|||||||
mod sandboxed_tty_writer;
|
mod sandboxed_tty_writer;
|
||||||
pub mod snapshots;
|
pub mod snapshots;
|
||||||
mod sys;
|
mod sys;
|
||||||
mod virtfs;
|
pub mod virtfs;
|
||||||
pub mod wasi;
|
pub mod wasi;
|
||||||
|
|
||||||
pub use ctx::{WasiCtx, WasiCtxBuilder, WasiCtxBuilderError};
|
pub use ctx::{WasiCtx, WasiCtxBuilder, WasiCtxBuilderError};
|
||||||
|
|||||||
@@ -11,6 +11,8 @@ use std::io::SeekFrom;
|
|||||||
use std::path::{Path, PathBuf};
|
use std::path::{Path, PathBuf};
|
||||||
use std::rc::Rc;
|
use std::rc::Rc;
|
||||||
|
|
||||||
|
pub mod pipe;
|
||||||
|
|
||||||
/// An entry in a virtual filesystem
|
/// An entry in a virtual filesystem
|
||||||
pub enum VirtualDirEntry {
|
pub enum VirtualDirEntry {
|
||||||
/// The contents of a child directory
|
/// The contents of a child directory
|
||||||
|
|||||||
407
crates/wasi-common/src/virtfs/pipe.rs
Normal file
407
crates/wasi-common/src/virtfs/pipe.rs
Normal file
@@ -0,0 +1,407 @@
|
|||||||
|
//! Virtual pipes.
|
||||||
|
//!
|
||||||
|
//! These types provide easy implementations of `Handle` 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.
|
||||||
|
//!
|
||||||
|
//! Note that `poll_oneoff` is not supported for these types, so they do not match the behavior of
|
||||||
|
//! real pipes exactly.
|
||||||
|
use crate::handle::{Handle, HandleRights};
|
||||||
|
use crate::wasi::{types, Errno, Result};
|
||||||
|
use std::any::Any;
|
||||||
|
use std::cell::{Cell, Ref, RefCell};
|
||||||
|
use std::io::{self, Read, Write};
|
||||||
|
use std::rc::Rc;
|
||||||
|
|
||||||
|
/// A virtual pipe read end.
|
||||||
|
///
|
||||||
|
/// A variety of `From` impls are provided so that common pipe types are easy to create. For example:
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// # use wasi_common::WasiCtxBuilder;
|
||||||
|
/// # use wasi_common::virtfs::pipe::ReadPipe;
|
||||||
|
/// let mut ctx = WasiCtxBuilder::new();
|
||||||
|
/// let stdin = ReadPipe::from("hello from stdin!");
|
||||||
|
/// ctx.stdin(stdin);
|
||||||
|
/// ```
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
pub struct ReadPipe<R: Read + Any> {
|
||||||
|
rights: Cell<HandleRights>,
|
||||||
|
reader: Rc<RefCell<R>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<R: Read + Any> 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(Rc::new(RefCell::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: Rc<RefCell<R>>) -> Self {
|
||||||
|
use types::Rights;
|
||||||
|
Self {
|
||||||
|
rights: Cell::new(HandleRights::from_base(
|
||||||
|
Rights::FD_DATASYNC
|
||||||
|
| Rights::FD_FDSTAT_SET_FLAGS
|
||||||
|
| Rights::FD_READ
|
||||||
|
| Rights::FD_SYNC
|
||||||
|
| Rights::FD_FILESTAT_GET
|
||||||
|
| Rights::POLL_FD_READWRITE,
|
||||||
|
)),
|
||||||
|
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) -> std::result::Result<R, Self> {
|
||||||
|
match Rc::try_unwrap(self.reader) {
|
||||||
|
Ok(rc) => Ok(RefCell::into_inner(rc)),
|
||||||
|
Err(reader) => {
|
||||||
|
self.reader = reader;
|
||||||
|
Err(self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<R: Read + Any> Handle for ReadPipe<R> {
|
||||||
|
fn as_any(&self) -> &dyn Any {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn try_clone(&self) -> io::Result<Box<dyn Handle>> {
|
||||||
|
Ok(Box::new(Self {
|
||||||
|
rights: self.rights.clone(),
|
||||||
|
reader: self.reader.clone(),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_file_type(&self) -> types::Filetype {
|
||||||
|
types::Filetype::Unknown
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_rights(&self) -> HandleRights {
|
||||||
|
self.rights.get()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_rights(&self, rights: HandleRights) {
|
||||||
|
self.rights.set(rights)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn advise(
|
||||||
|
&self,
|
||||||
|
_advice: types::Advice,
|
||||||
|
_offset: types::Filesize,
|
||||||
|
_len: types::Filesize,
|
||||||
|
) -> Result<()> {
|
||||||
|
Err(Errno::Spipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocate(&self, _offset: types::Filesize, _len: types::Filesize) -> Result<()> {
|
||||||
|
Err(Errno::Spipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fdstat_set_flags(&self, _fdflags: types::Fdflags) -> Result<()> {
|
||||||
|
// do nothing for now
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn filestat_get(&self) -> Result<types::Filestat> {
|
||||||
|
let stat = types::Filestat {
|
||||||
|
dev: 0,
|
||||||
|
ino: 0,
|
||||||
|
nlink: 0,
|
||||||
|
size: 0,
|
||||||
|
atim: 0,
|
||||||
|
ctim: 0,
|
||||||
|
mtim: 0,
|
||||||
|
filetype: self.get_file_type(),
|
||||||
|
};
|
||||||
|
Ok(stat)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn filestat_set_size(&self, _st_size: types::Filesize) -> Result<()> {
|
||||||
|
Err(Errno::Spipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn preadv(&self, buf: &mut [io::IoSliceMut], offset: types::Filesize) -> Result<usize> {
|
||||||
|
if offset != 0 {
|
||||||
|
return Err(Errno::Spipe);
|
||||||
|
}
|
||||||
|
Ok(self.reader.borrow_mut().read_vectored(buf)?)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn seek(&self, _offset: io::SeekFrom) -> Result<types::Filesize> {
|
||||||
|
Err(Errno::Spipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read_vectored(&self, iovs: &mut [io::IoSliceMut]) -> Result<usize> {
|
||||||
|
Ok(self.reader.borrow_mut().read_vectored(iovs)?)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn create_directory(&self, _path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn openat(
|
||||||
|
&self,
|
||||||
|
_path: &str,
|
||||||
|
_read: bool,
|
||||||
|
_write: bool,
|
||||||
|
_oflags: types::Oflags,
|
||||||
|
_fd_flags: types::Fdflags,
|
||||||
|
) -> Result<Box<dyn Handle>> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn link(
|
||||||
|
&self,
|
||||||
|
_old_path: &str,
|
||||||
|
_new_handle: Box<dyn Handle>,
|
||||||
|
_new_path: &str,
|
||||||
|
_follow: bool,
|
||||||
|
) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn readlink(&self, _path: &str, _buf: &mut [u8]) -> Result<usize> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn readlinkat(&self, _path: &str) -> Result<String> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn rename(&self, _old_path: &str, _new_handle: Box<dyn Handle>, _new_path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn remove_directory(&self, _path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn symlink(&self, _old_path: &str, _new_path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn unlink_file(&self, _path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A virtual pipe write end.
|
||||||
|
#[derive(Clone, Debug)]
|
||||||
|
pub struct WritePipe<W: Write + Any> {
|
||||||
|
rights: Cell<HandleRights>,
|
||||||
|
writer: Rc<RefCell<W>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<W: Write + Any> 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(Rc::new(RefCell::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: Rc<RefCell<W>>) -> Self {
|
||||||
|
use types::Rights;
|
||||||
|
Self {
|
||||||
|
rights: Cell::new(HandleRights::from_base(
|
||||||
|
Rights::FD_DATASYNC
|
||||||
|
| Rights::FD_FDSTAT_SET_FLAGS
|
||||||
|
| Rights::FD_SYNC
|
||||||
|
| Rights::FD_WRITE
|
||||||
|
| Rights::FD_FILESTAT_GET
|
||||||
|
| Rights::POLL_FD_READWRITE,
|
||||||
|
)),
|
||||||
|
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) -> std::result::Result<W, Self> {
|
||||||
|
match Rc::try_unwrap(self.writer) {
|
||||||
|
Ok(rc) => Ok(RefCell::into_inner(rc)),
|
||||||
|
Err(writer) => {
|
||||||
|
self.writer = writer;
|
||||||
|
Err(self)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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![]))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Get a reference to the bytes contained in the underlying `Vec<u8>` buffer.
|
||||||
|
pub fn as_slice(&self) -> Ref<[u8]> {
|
||||||
|
Ref::map(self.writer.borrow(), |c| c.get_ref().as_slice())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<W: Write + Any> Handle for WritePipe<W> {
|
||||||
|
fn as_any(&self) -> &dyn Any {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn try_clone(&self) -> io::Result<Box<dyn Handle>> {
|
||||||
|
Ok(Box::new(Self {
|
||||||
|
rights: self.rights.clone(),
|
||||||
|
writer: self.writer.clone(),
|
||||||
|
}))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_file_type(&self) -> types::Filetype {
|
||||||
|
types::Filetype::Unknown
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_rights(&self) -> HandleRights {
|
||||||
|
self.rights.get()
|
||||||
|
}
|
||||||
|
|
||||||
|
fn set_rights(&self, rights: HandleRights) {
|
||||||
|
self.rights.set(rights)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn advise(
|
||||||
|
&self,
|
||||||
|
_advice: types::Advice,
|
||||||
|
_offset: types::Filesize,
|
||||||
|
_len: types::Filesize,
|
||||||
|
) -> Result<()> {
|
||||||
|
Err(Errno::Spipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn allocate(&self, _offset: types::Filesize, _len: types::Filesize) -> Result<()> {
|
||||||
|
Err(Errno::Spipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn fdstat_set_flags(&self, _fdflags: types::Fdflags) -> Result<()> {
|
||||||
|
// do nothing for now
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn filestat_get(&self) -> Result<types::Filestat> {
|
||||||
|
let stat = types::Filestat {
|
||||||
|
dev: 0,
|
||||||
|
ino: 0,
|
||||||
|
nlink: 0,
|
||||||
|
size: 0,
|
||||||
|
atim: 0,
|
||||||
|
ctim: 0,
|
||||||
|
mtim: 0,
|
||||||
|
filetype: self.get_file_type(),
|
||||||
|
};
|
||||||
|
Ok(stat)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn filestat_set_size(&self, _st_size: types::Filesize) -> Result<()> {
|
||||||
|
Err(Errno::Spipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pwritev(&self, buf: &[io::IoSlice], offset: types::Filesize) -> Result<usize> {
|
||||||
|
if offset != 0 {
|
||||||
|
return Err(Errno::Spipe);
|
||||||
|
}
|
||||||
|
Ok(self.writer.borrow_mut().write_vectored(buf)?)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn seek(&self, _offset: io::SeekFrom) -> Result<types::Filesize> {
|
||||||
|
Err(Errno::Spipe)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write_vectored(&self, iovs: &[io::IoSlice]) -> Result<usize> {
|
||||||
|
Ok(self.writer.borrow_mut().write_vectored(iovs)?)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn create_directory(&self, _path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn openat(
|
||||||
|
&self,
|
||||||
|
_path: &str,
|
||||||
|
_read: bool,
|
||||||
|
_write: bool,
|
||||||
|
_oflags: types::Oflags,
|
||||||
|
_fd_flags: types::Fdflags,
|
||||||
|
) -> Result<Box<dyn Handle>> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn link(
|
||||||
|
&self,
|
||||||
|
_old_path: &str,
|
||||||
|
_new_handle: Box<dyn Handle>,
|
||||||
|
_new_path: &str,
|
||||||
|
_follow: bool,
|
||||||
|
) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn readlink(&self, _path: &str, _buf: &mut [u8]) -> Result<usize> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn readlinkat(&self, _path: &str) -> Result<String> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn rename(&self, _old_path: &str, _new_handle: Box<dyn Handle>, _new_path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn remove_directory(&self, _path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn symlink(&self, _old_path: &str, _new_path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn unlink_file(&self, _path: &str) -> Result<()> {
|
||||||
|
Err(Errno::Notdir)
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user