Skip to content

Commit

Permalink
Update to [email protected].
Browse files Browse the repository at this point in the history 
Update WASI-virt to [email protected]. Several
interfaces in wasi-sockets changed, so this updates the
virtual-adapter accordingly.
  • Loading branch information
@sunfishcode
sunfishcode committed Jan 23, 2024
1 parent 0ae1059 commit fb7b4fc
Show file tree
Hide file tree
Showing 17 changed files with 1,055 additions and 877 deletions.
198 changes: 116 additions & 82 deletions virtual-adapter/src/io.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,23 @@ use crate::exports::wasi::io::streams::{
StreamError,
};
use crate::exports::wasi::sockets::ip_name_lookup::{
Guest as IpNameLookup, GuestResolveAddressStream, IpAddress, IpAddressFamily, Network,
ResolveAddressStream,
Guest as IpNameLookup, GuestResolveAddressStream, IpAddress, Network, ResolveAddressStream,
};
use crate::exports::wasi::sockets::tcp::{
ErrorCode as NetworkErrorCode, GuestTcpSocket, IpSocketAddress, ShutdownType, TcpSocket,
};
use crate::exports::wasi::sockets::udp::{Datagram, GuestUdpSocket, UdpSocket};
use crate::exports::wasi::sockets::udp::{
GuestIncomingDatagramStream, GuestOutgoingDatagramStream, GuestUdpSocket, IncomingDatagram,
OutgoingDatagram, UdpSocket,
};

use crate::wasi::cli::stderr;
use crate::wasi::cli::stdin;
use crate::wasi::cli::stdout;
use crate::wasi::filesystem::preopens;
use crate::wasi::filesystem::types as filesystem_types;
use crate::wasi::io::streams;
use crate::wasi::sockets::network::IpAddressFamily;

// these are all the subsystems which touch streams + poll
use crate::wasi::clocks::monotonic_clock;
Expand Down Expand Up @@ -422,6 +425,8 @@ pub struct HttpResponseOutparam(http_types::ResponseOutparam);
pub struct SocketsResolveAddressStream(ip_name_lookup::ResolveAddressStream);
pub struct SocketsTcpSocket(tcp::TcpSocket);
pub struct SocketsUdpSocket(udp::UdpSocket);
pub struct SocketsIncomingDatagramStream(udp::IncomingDatagramStream);
pub struct SocketsOutgoingDatagramStream(udp::OutgoingDatagramStream);

pub struct IoState {
initialized: bool,
Expand Down Expand Up @@ -684,12 +689,10 @@ impl IpNameLookup for VirtAdapter {
fn resolve_addresses(
network: &Network,
name: String,
address_family: Option<IpAddressFamily>,
include_unavailable: bool,
) -> Result<Resource<ResolveAddressStream>, NetworkErrorCode> {
debug!("CALL wasi:sockets/ip-name-lookup#resolve-addresses");
Ok(Resource::new(SocketsResolveAddressStream(
ip_name_lookup::resolve_addresses(network, &name, address_family, include_unavailable)?,
ip_name_lookup::resolve_addresses(network, &name)?,
)))
}
}
Expand Down Expand Up @@ -1457,41 +1460,17 @@ impl GuestTcpSocket for TcpSocket {
debug!("CALL wasi:sockets/tcp#tcp-socket.address-family");
self.0.address_family()
}
fn ipv6_only(&self) -> Result<bool, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.ipv6-only");
self.0.ipv6_only()
}
fn set_ipv6_only(&self, value: bool) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-ipv6-only");
self.0.set_ipv6_only(value)
}
fn set_listen_backlog_size(&self, value: u64) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-listen-backlog-size");
self.0.set_listen_backlog_size(value)
}
fn keep_alive(&self) -> Result<bool, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.keep-alive");
self.0.keep_alive()
}
fn set_keep_alive(&self, value: bool) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-keep-alive");
self.0.set_keep_alive(value)
}
fn no_delay(&self) -> Result<bool, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.no-delay");
self.0.no_delay()
}
fn set_no_delay(&self, value: bool) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-no-delay");
self.0.set_no_delay(value)
fn keep_alive_enabled(&self) -> Result<bool, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.keep-alive-enabled");
self.0.keep_alive_enabled()
}
fn unicast_hop_limit(&self) -> Result<u8, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.unicast-hop-limit");
self.0.unicast_hop_limit()
}
fn set_unicast_hop_limit(&self, value: u8) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-unicast-hop-limit");
self.0.set_unicast_hop_limit(value)
fn set_keep_alive_enabled(&self, value: bool) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-keep-alive-enabled");
self.0.set_keep_alive_enabled(value)
}
fn receive_buffer_size(&self) -> Result<u64, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.receive-buffer-size");
Expand Down Expand Up @@ -1521,6 +1500,42 @@ impl GuestTcpSocket for TcpSocket {
ShutdownType::Both => tcp::ShutdownType::Both,
})
}
fn is_listening(&self) -> bool {
debug!("CALL wasi:sockets/tcp#tcp-socket.is-listening");
self.0.is_listening()
}
fn keep_alive_idle_time(&self) -> Result<u64, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.keep-alive-idel-time");
self.0.keep_alive_idle_time()
}
fn set_keep_alive_idle_time(&self, value: u64) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-keep-alive-idel-time");
self.0.set_keep_alive_idle_time(value)
}
fn keep_alive_interval(&self) -> Result<u64, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.keep-alive-interval");
self.0.keep_alive_interval()
}
fn set_keep_alive_interval(&self, value: u64) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-keep-alive-interval");
self.0.set_keep_alive_interval(value)
}
fn keep_alive_count(&self) -> Result<u32, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.keep-alive-count");
self.0.keep_alive_count()
}
fn set_keep_alive_count(&self, value: u32) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-keep-alive-count");
self.0.set_keep_alive_count(value)
}
fn hop_limit(&self) -> Result<u8, NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.hop-limit");
self.0.hop_limit()
}
fn set_hop_limit(&self, value: u8) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/tcp#tcp-socket.set-hop-limit");
self.0.set_hop_limit(value)
}
}

impl GuestUdpSocket for UdpSocket {
Expand All @@ -1536,44 +1551,6 @@ impl GuestUdpSocket for UdpSocket {
debug!("CALL wasi:sockets/udp#udp-socket.finish-bind");
self.0.finish_bind()
}
fn start_connect(
&self,
network: &Network,
remote_address: IpSocketAddress,
) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#udp-socket.start-connect");
self.0.start_connect(network, remote_address)
}
fn finish_connect(&self) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#udp-socket.finish-connect");
self.0.finish_connect()
}
fn receive(&self, max_results: u64) -> Result<Vec<Datagram>, NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#udp-socket.receive");
match self.0.receive(max_results) {
Ok(mut datagrams) => Ok(datagrams
.drain(..)
.map(|d| Datagram {
data: d.data,
remote_address: d.remote_address,
})
.collect::<Vec<Datagram>>()),
Err(err) => Err(err),
}
}
fn send(&self, mut datagrams: Vec<Datagram>) -> Result<u64, NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#udp-socket.send");
self.0.send(
datagrams
.drain(..)
.map(|d| udp::Datagram {
data: d.data,
remote_address: d.remote_address,
})
.collect::<Vec<udp::Datagram>>()
.as_slice(),
)
}
fn local_address(&self) -> Result<IpSocketAddress, NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#udp-socket.local-address");
self.0.local_address()
Expand All @@ -1586,14 +1563,6 @@ impl GuestUdpSocket for UdpSocket {
debug!("CALL wasi:sockets/udp#udp-socket.address-family");
self.0.address_family()
}
fn ipv6_only(&self) -> Result<bool, NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#udp-socket.ipv6-only");
self.0.ipv6_only()
}
fn set_ipv6_only(&self, value: bool) -> Result<(), NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#udp-socket.set-ipv6-only");
self.0.set_ipv6_only(value)
}
fn unicast_hop_limit(&self) -> Result<u8, NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#udp-socket.unicast-hop-limit");
self.0.unicast_hop_limit()
Expand Down Expand Up @@ -1622,6 +1591,71 @@ impl GuestUdpSocket for UdpSocket {
debug!("CALL wasi:sockets/udp#udp-socket.subscribe");
Resource::new(Pollable::Host(self.0.subscribe()))
}
fn stream(
&self,
remote_address: Option<IpSocketAddress>,
) -> Result<
(
Resource<SocketsIncomingDatagramStream>,
Resource<SocketsOutgoingDatagramStream>,
),
NetworkErrorCode,
> {
debug!("CALL wasi:sockets/udp#udp-socket.stream");
self.0.stream(remote_address).map(|(in_, out)| {
(
Resource::new(SocketsIncomingDatagramStream(in_)),
Resource::new(SocketsOutgoingDatagramStream(out)),
)
})
}
}

impl GuestIncomingDatagramStream for SocketsIncomingDatagramStream {
fn receive(&self, max_results: u64) -> Result<Vec<IncomingDatagram>, NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#incoming-datagram-stream.receive");
match self.0.receive(max_results) {
Ok(mut datagrams) => Ok(datagrams
.drain(..)
.map(|d| IncomingDatagram {
data: d.data,
remote_address: d.remote_address,
})
.collect::<Vec<IncomingDatagram>>()),
Err(err) => Err(err),
}
}

fn subscribe(&self) -> Resource<IoPollable> {
debug!("CALL wasi:sockets/udp#incoming-datagram-stream.subscribe");
Resource::new(Pollable::Host(self.0.subscribe()))
}
}

impl GuestOutgoingDatagramStream for SocketsOutgoingDatagramStream {
fn check_send(&self) -> Result<u64, NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#outgoing-datagram-stream.check-send");
self.0.check_send()
}

fn send(&self, mut datagrams: Vec<OutgoingDatagram>) -> Result<u64, NetworkErrorCode> {
debug!("CALL wasi:sockets/udp#outgoing-datagram-stream.send");
self.0.send(
datagrams
.drain(..)
.map(|d| udp::OutgoingDatagram {
data: d.data,
remote_address: d.remote_address,
})
.collect::<Vec<udp::OutgoingDatagram>>()
.as_slice(),
)
}

fn subscribe(&self) -> Resource<IoPollable> {
debug!("CALL wasi:sockets/udp#outgoing-datagram-stream.subscribe");
Resource::new(Pollable::Host(self.0.subscribe()))
}
}

fn descriptor_ty_map(d: filesystem_types::DescriptorType) -> DescriptorType {
Expand Down
2 changes: 2 additions & 0 deletions virtual-adapter/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@ wit_bindgen::generate!({
"wasi:sockets/ip-name-lookup/resolve-address-stream": io::SocketsResolveAddressStream,
"wasi:sockets/tcp/tcp-socket": io::SocketsTcpSocket,
"wasi:sockets/udp/udp-socket": io::SocketsUdpSocket,
"wasi:sockets/udp/incoming-datagram-stream": io::SocketsIncomingDatagramStream,
"wasi:sockets/udp/outgoing-datagram-stream": io::SocketsOutgoingDatagramStream,
}
});
2 changes: 1 addition & 1 deletion wit/deps/cli/command.wit
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:cli@0.2.0-rc-2023-12-05;
package wasi:cli@0.2.0-rc-2024-01-16;

world command {
include imports;
Expand Down
4 changes: 2 additions & 2 deletions wit/deps/cli/imports.wit
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package wasi:cli@0.2.0-rc-2023-12-05;
package wasi:cli@0.2.0-rc-2024-01-16;

world imports {
include wasi:clocks/imports@0.2.0-rc-2023-11-10;
include wasi:filesystem/imports@0.2.0-rc-2023-11-10;
include wasi:sockets/imports@0.2.0-rc-2023-10-18;
include wasi:sockets/imports@0.2.0-rc-2024-01-16;
include wasi:random/imports@0.2.0-rc-2023-11-10;
include wasi:io/imports@0.2.0-rc-2023-11-10;

Expand Down
18 changes: 10 additions & 8 deletions wit/deps/cli/terminal.wit
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
/// Terminal input.
///
/// In the future, this may include functions for disabling echoing,
/// disabling input buffering so that keyboard events are sent through
/// immediately, querying supported features, and so on.
interface terminal-input {
/// The input side of a terminal.
resource terminal-input;

// In the future, this may include functions for disabling echoing,
// disabling input buffering so that keyboard events are sent through
// immediately, querying supported features, and so on.
}

/// Terminal output.
///
/// In the future, this may include functions for querying the terminal
/// size, being notified of terminal size changes, querying supported
/// features, and so on.
interface terminal-output {
/// The output side of a terminal.
resource terminal-output;

// In the future, this may include functions for querying the terminal
// size, being notified of terminal size changes, querying supported
// features, and so on.
}

/// An interface providing an optional `terminal-input` for stdin as a
Expand Down
6 changes: 3 additions & 3 deletions wit/deps/http/proxy.wit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ world proxy {

// Proxies have standard output and error streams which are expected to
// terminate in a developer-facing console provided by the host.
import wasi:cli/stdout@0.2.0-rc-2023-12-05;
import wasi:cli/stderr@0.2.0-rc-2023-12-05;
import wasi:cli/stdout@0.2.0-rc-2024-01-16;
import wasi:cli/stderr@0.2.0-rc-2024-01-16;

// TODO: this is a temporary workaround until component tooling is able to
// gracefully handle the absence of stdin. Hosts must return an eof stream
// for this import, which is what wasi-libc + tooling will do automatically
// when this import is properly removed.
import wasi:cli/stdin@0.2.0-rc-2023-12-05;
import wasi:cli/stdin@0.2.0-rc-2024-01-16;

// This is the default handler to use when user code simply wants to make an
// HTTP request (e.g., via `fetch()`).
Expand Down
2 changes: 1 addition & 1 deletion wit/deps/io/poll.wit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package wasi:[email protected];
/// A poll API intended to let users wait for I/O events on multiple handles
/// at once.
interface poll {
/// `pollable` epresents a single I/O event which may be ready, or not.
/// `pollable` represents a single I/O event which may be ready, or not.
resource pollable {

/// Return the readiness of a pollable. This function never blocks.
Expand Down
Loading

0 comments on commit fb7b4fc

Please sign in to comment.