github
/
cranelift
mirror of https://github.com/bytecodealliance/wasmtime.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1961 from bytecodealliance/pch/sync_wasi_pipe 

wasi-common virtfs pipe: convert to be Send and Sync; fix Clone
pull/1963/head
Pat Hickey 4 years ago
committed by GitHub
parent
0aa56c500c e7869c7320
commit
301277e60d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 45 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 84
      crates/wasi-common/src/virtfs/pipe.rs

84
crates/wasi-common/src/virtfs/pipe.rs
View File

@ -12,9 +12,8 @@
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;
use std::sync::{Arc, RwLock};
/// A virtual pipe read end.
///
@ -27,10 +26,19 @@ use std::rc::Rc;
/// let stdin = ReadPipe::from("hello from stdin!");
/// ctx.stdin(stdin);
/// ```
#[derive(Clone, Debug)]
#[derive(Debug)]
pub struct ReadPipe<R: Read + Any> {
rights: Cell<HandleRights>,
reader: Rc<RefCell<R>>,
rights: RwLock<HandleRights>,
reader: Arc<RwLock<R>>,
}
impl<R: Read + Any> Clone for ReadPipe<R> {
fn clone(&self) -> Self {
Self {
rights: RwLock::new(*self.rights.read().unwrap()),
reader: self.reader.clone(),
}
}
}
impl<R: Read + Any> ReadPipe<R> {
@ -38,16 +46,16 @@ impl<R: Read + Any> ReadPipe<R> {
///
/// 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)))
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: Rc<RefCell<R>>) -> Self {
pub fn from_shared(reader: Arc<RwLock<R>>) -> Self {
use types::Rights;
Self {
rights: Cell::new(HandleRights::from_base(
rights: RwLock::new(HandleRights::from_base(
Rights::FD_DATASYNC
| Rights::FD_FDSTAT_SET_FLAGS
| Rights::FD_READ
@ -63,8 +71,8 @@ impl<R: Read + Any> ReadPipe<R> {
///
/// 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)),
match Arc::try_unwrap(self.reader) {
Ok(rc) => Ok(RwLock::into_inner(rc).unwrap()),
Err(reader) => {
self.reader = reader;
Err(self)
@ -103,10 +111,7 @@ impl<R: Read + Any> Handle for ReadPipe<R> {
}
fn try_clone(&self) -> io::Result<Box<dyn Handle>> {
Ok(Box::new(Self {
rights: self.rights.clone(),
reader: self.reader.clone(),
}))
Ok(Box::new(self.clone()))
}
fn get_file_type(&self) -> types::Filetype {
@ -114,11 +119,11 @@ impl<R: Read + Any> Handle for ReadPipe<R> {
}
fn get_rights(&self) -> HandleRights {
self.rights.get()
*self.rights.read().unwrap()
}
fn set_rights(&self, rights: HandleRights) {
self.rights.set(rights)
*self.rights.write().unwrap() = rights;
}
fn advise(
@ -161,7 +166,7 @@ impl<R: Read + Any> Handle for ReadPipe<R> {
if offset != 0 {
return Err(Errno::Spipe);
}
Ok(self.reader.borrow_mut().read_vectored(buf)?)
Ok(self.reader.write().unwrap().read_vectored(buf)?)
}
fn seek(&self, _offset: io::SeekFrom) -> Result<types::Filesize> {
@ -169,7 +174,7 @@ impl<R: Read + Any> Handle for ReadPipe<R> {
}
fn read_vectored(&self, iovs: &mut [io::IoSliceMut]) -> Result<usize> {
Ok(self.reader.borrow_mut().read_vectored(iovs)?)
Ok(self.reader.write().unwrap().read_vectored(iovs)?)
}
fn create_directory(&self, _path: &str) -> Result<()> {
@ -223,10 +228,19 @@ impl<R: Read + Any> Handle for ReadPipe<R> {
}
/// A virtual pipe write end.
#[derive(Clone, Debug)]
#[derive(Debug)]
pub struct WritePipe<W: Write + Any> {
rights: Cell<HandleRights>,
writer: Rc<RefCell<W>>,
rights: RwLock<HandleRights>,
writer: Arc<RwLock<W>>,
}
impl<W: Write + Any> Clone for WritePipe<W> {
fn clone(&self) -> Self {
Self {
rights: RwLock::new(*self.rights.read().unwrap()),
writer: self.writer.clone(),
}
}
}
impl<W: Write + Any> WritePipe<W> {
@ -234,16 +248,16 @@ impl<W: Write + Any> WritePipe<W> {
///
/// 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)))
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: Rc<RefCell<W>>) -> Self {
pub fn from_shared(writer: Arc<RwLock<W>>) -> Self {
use types::Rights;
Self {
rights: Cell::new(HandleRights::from_base(
rights: RwLock::new(HandleRights::from_base(
Rights::FD_DATASYNC
| Rights::FD_FDSTAT_SET_FLAGS
| Rights::FD_SYNC
@ -259,8 +273,8 @@ impl<W: Write + Any> WritePipe<W> {
///
/// 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)),
match Arc::try_unwrap(self.writer) {
Ok(rc) => Ok(RwLock::into_inner(rc).unwrap()),
Err(writer) => {
self.writer = writer;
Err(self)
@ -274,11 +288,6 @@ impl WritePipe<io::Cursor<Vec<u8>>> {
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> {
@ -287,10 +296,7 @@ impl<W: Write + Any> Handle for WritePipe<W> {
}
fn try_clone(&self) -> io::Result<Box<dyn Handle>> {
Ok(Box::new(Self {
rights: self.rights.clone(),
writer: self.writer.clone(),
}))
Ok(Box::new(self.clone()))
}
fn get_file_type(&self) -> types::Filetype {
@ -298,11 +304,11 @@ impl<W: Write + Any> Handle for WritePipe<W> {
}
fn get_rights(&self) -> HandleRights {
self.rights.get()
*self.rights.read().unwrap()
}
fn set_rights(&self, rights: HandleRights) {
self.rights.set(rights)
*self.rights.write().unwrap() = rights;
}
fn advise(
@ -345,7 +351,7 @@ impl<W: Write + Any> Handle for WritePipe<W> {
if offset != 0 {
return Err(Errno::Spipe);
}
Ok(self.writer.borrow_mut().write_vectored(buf)?)
Ok(self.writer.write().unwrap().write_vectored(buf)?)
}
fn seek(&self, _offset: io::SeekFrom) -> Result<types::Filesize> {
@ -353,7 +359,7 @@ impl<W: Write + Any> Handle for WritePipe<W> {
}
fn write_vectored(&self, iovs: &[io::IoSlice]) -> Result<usize> {
Ok(self.writer.borrow_mut().write_vectored(iovs)?)
Ok(self.writer.write().unwrap().write_vectored(iovs)?)
}
fn create_directory(&self, _path: &str) -> Result<()> {

Write Preview
Loading…
Cancel
Save