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

address review comments

Browse Source
This commit is contained in:
Adam C. Foltzer
2020-07-01 09:46:38 -07:00
parent 5a96b0deaa
commit fddd94d23f
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@
//! real pipes exactly. //! real pipes exactly.
use crate::handle::{Handle, HandleRights}; use crate::handle::{Handle, HandleRights};
use crate::wasi::{types, Errno, Result}; use crate::wasi::{types, Errno, Result};
use log::trace;
use std::any::Any; use std::any::Any;
use std::cell::{Cell, Ref, RefCell}; use std::cell::{Cell, Ref, RefCell};
use std::io::{self, Read, Write}; use std::io::{self, Read, Write};
@@ -48,14 +47,13 @@ impl<R: Read + Any> ReadPipe<R> {
pub fn from_shared(reader: Rc<RefCell<R>>) -> Self { pub fn from_shared(reader: Rc<RefCell<R>>) -> Self {
use types::Rights; use types::Rights;
Self { Self {
rights: Cell::new(HandleRights::new( rights: Cell::new(HandleRights::from_base(
Rights::FD_DATASYNC Rights::FD_DATASYNC
| Rights::FD_FDSTAT_SET_FLAGS | Rights::FD_FDSTAT_SET_FLAGS
| Rights::FD_READ | Rights::FD_READ
| Rights::FD_SYNC | Rights::FD_SYNC
| Rights::FD_FILESTAT_GET | Rights::FD_FILESTAT_GET
| Rights::POLL_FD_READWRITE, | Rights::POLL_FD_READWRITE,
Rights::empty(),
)), )),
reader, reader,
} }
@@ -171,7 +169,6 @@ impl<R: Read + Any> Handle for ReadPipe<R> {
} }
fn read_vectored(&self, iovs: &mut [io::IoSliceMut]) -> Result<usize> { fn read_vectored(&self, iovs: &mut [io::IoSliceMut]) -> Result<usize> {
trace!("read_vectored(iovs={:?})", iovs);
Ok(self.reader.borrow_mut().read_vectored(iovs)?) Ok(self.reader.borrow_mut().read_vectored(iovs)?)
} }
@@ -246,14 +243,13 @@ impl<W: Write + Any> WritePipe<W> {
pub fn from_shared(writer: Rc<RefCell<W>>) -> Self { pub fn from_shared(writer: Rc<RefCell<W>>) -> Self {
use types::Rights; use types::Rights;
Self { Self {
rights: Cell::new(HandleRights::new( rights: Cell::new(HandleRights::from_base(
Rights::FD_DATASYNC Rights::FD_DATASYNC
| Rights::FD_FDSTAT_SET_FLAGS | Rights::FD_FDSTAT_SET_FLAGS
| Rights::FD_SYNC | Rights::FD_SYNC
| Rights::FD_WRITE | Rights::FD_WRITE
| Rights::FD_FILESTAT_GET | Rights::FD_FILESTAT_GET
| Rights::POLL_FD_READWRITE, | Rights::POLL_FD_READWRITE,
Rights::empty(),
)), )),
writer, writer,
} }
@@ -357,7 +353,6 @@ impl<W: Write + Any> Handle for WritePipe<W> {
} }
fn write_vectored(&self, iovs: &[io::IoSlice]) -> Result<usize> { fn write_vectored(&self, iovs: &[io::IoSlice]) -> Result<usize> {
trace!("write_vectored(iovs={:?})", iovs);
Ok(self.writer.borrow_mut().write_vectored(iovs)?) Ok(self.writer.borrow_mut().write_vectored(iovs)?)
} }