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

feat: remove the limitation of either R or W polls (#3866)

Browse Source 
Allow polls on read _and_ write.

Signed-off-by: Harald Hoyer <harald@profian.com>
This commit is contained in:
Harald Hoyer
2022-03-01 19:19:04 +01:00
committed by GitHub
parent 98ef18a22a
commit e8ae3c0afd
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/wasi-common/src/snapshots/preview_1.rs
View File

@@ -12,7 +12,6 @@ use crate::{
}; };
use anyhow::Context; use anyhow::Context;
use cap_std::time::{Duration, SystemClock}; use cap_std::time::{Duration, SystemClock};
use std::collections::HashSet;
use std::convert::{TryFrom, TryInto}; use std::convert::{TryFrom, TryInto};
use std::io::{IoSlice, IoSliceMut}; use std::io::{IoSlice, IoSliceMut};
use std::ops::{Deref, DerefMut}; use std::ops::{Deref, DerefMut};
@@ -973,7 +972,6 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
} }
let table = &mut self.table; let table = &mut self.table;
let mut sub_fds: HashSet<types::Fd> = HashSet::new();
// We need these refmuts to outlive Poll, which will hold the &mut dyn WasiFile inside // We need these refmuts to outlive Poll, which will hold the &mut dyn WasiFile inside
let mut read_refs: Vec<(&dyn WasiFile, Userdata)> = Vec::new(); let mut read_refs: Vec<(&dyn WasiFile, Userdata)> = Vec::new();
let mut write_refs: Vec<(&dyn WasiFile, Userdata)> = Vec::new(); let mut write_refs: Vec<(&dyn WasiFile, Userdata)> = Vec::new();
@@ -1015,12 +1013,6 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}, },
types::SubscriptionU::FdRead(readsub) => { types::SubscriptionU::FdRead(readsub) => {
let fd = readsub.file_descriptor; let fd = readsub.file_descriptor;
if sub_fds.contains(&fd) {
return Err(Error::invalid_argument()
.context("Fd can be subscribed to at most once per poll"));
} else {
sub_fds.insert(fd);
}
let file_ref = table let file_ref = table
.get_file(u32::from(fd))? .get_file(u32::from(fd))?
.get_cap(FileCaps::POLL_READWRITE)?; .get_cap(FileCaps::POLL_READWRITE)?;
@@ -1028,12 +1020,6 @@ impl wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
} }
types::SubscriptionU::FdWrite(writesub) => { types::SubscriptionU::FdWrite(writesub) => {
let fd = writesub.file_descriptor; let fd = writesub.file_descriptor;
if sub_fds.contains(&fd) {
return Err(Error::invalid_argument()
.context("Fd can be subscribed to at most once per poll"));
} else {
sub_fds.insert(fd);
}
let file_ref = table let file_ref = table
.get_file(u32::from(fd))? .get_file(u32::from(fd))?
.get_cap(FileCaps::POLL_READWRITE)?; .get_cap(FileCaps::POLL_READWRITE)?;