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

Put context object behind a ref rather than mut ref

Browse Source 
This commit puts context object, i.e., the implementor of the
WASI snapshot, behind a reference `&self` rather than a mutable
reference `&mut self`. As suggested by @alexcrichton, this gives
the implementor the possibility to determine how it handles its
interior mutability.
This commit is contained in:
Jakub Konka
2020-03-03 15:25:11 +01:00
committed by Jakub Konka
parent ea4d2d0535
commit 3764204250
13 changed files with 74 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
tests/wasi.rs
View File

@@ -10,47 +10,49 @@ type Result<T> = std::result::Result<T, types::Errno>;
impl GuestErrorType for types::Errno {
type Context = WasiCtx;
fn success() -> types::Errno {
types::Errno::Success
}
fn from_error(e: GuestError, ctx: &mut WasiCtx) -> types::Errno {
fn from_error(e: GuestError, ctx: &WasiCtx) -> types::Errno {
eprintln!("GUEST ERROR: {:?}", e);
ctx.guest_errors.push(e);
ctx.guest_errors.borrow_mut().push(e);
types::Errno::Io
}
}
impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
fn args_get(
&mut self,
&self,
_argv: GuestPtrMut<GuestPtrMut<u8>>,
_argv_buf: GuestPtrMut<u8>,
) -> Result<()> {
unimplemented!("args_get")
}
fn args_sizes_get(&mut self) -> Result<(types::Size, types::Size)> {
fn args_sizes_get(&self) -> Result<(types::Size, types::Size)> {
unimplemented!("args_sizes_get")
}
fn environ_get(
&mut self,
&self,
_environ: GuestPtrMut<GuestPtrMut<u8>>,
_environ_buf: GuestPtrMut<u8>,
) -> Result<()> {
unimplemented!("environ_get")
}
fn environ_sizes_get(&mut self) -> Result<(types::Size, types::Size)> {
fn environ_sizes_get(&self) -> Result<(types::Size, types::Size)> {
unimplemented!("environ_sizes_get")
}
fn clock_res_get(&mut self, _id: types::Clockid) -> Result<types::Timestamp> {
fn clock_res_get(&self, _id: types::Clockid) -> Result<types::Timestamp> {
unimplemented!("clock_res_get")
}
fn clock_time_get(
&mut self,
&self,
_id: types::Clockid,
_precision: types::Timestamp,
) -> Result<types::Timestamp> {
@@ -58,7 +60,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn fd_advise(
&mut self,
&self,
_fd: types::Fd,
_offset: types::Filesize,
_len: types::Filesize,
@@ -68,7 +70,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn fd_allocate(
&mut self,
&self,
_fd: types::Fd,
_offset: types::Filesize,
_len: types::Filesize,
@@ -76,24 +78,24 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("fd_allocate")
}
fn fd_close(&mut self, _fd: types::Fd) -> Result<()> {
fn fd_close(&self, _fd: types::Fd) -> Result<()> {
unimplemented!("fd_close")
}
fn fd_datasync(&mut self, _fd: types::Fd) -> Result<()> {
fn fd_datasync(&self, _fd: types::Fd) -> Result<()> {
unimplemented!("fd_datasync")
}
fn fd_fdstat_get(&mut self, _fd: types::Fd) -> Result<types::Fdstat> {
fn fd_fdstat_get(&self, _fd: types::Fd) -> Result<types::Fdstat> {
unimplemented!("fd_fdstat_get")
}
fn fd_fdstat_set_flags(&mut self, _fd: types::Fd, _flags: types::Fdflags) -> Result<()> {
fn fd_fdstat_set_flags(&self, _fd: types::Fd, _flags: types::Fdflags) -> Result<()> {
unimplemented!("fd_fdstat_set_flags")
}
fn fd_fdstat_set_rights(
&mut self,
&self,
_fd: types::Fd,
_fs_rights_base: types::Rights,
_fs_rights_inherting: types::Rights,
@@ -101,16 +103,16 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("fd_fdstat_set_rights")
}
fn fd_filestat_get(&mut self, _fd: types::Fd) -> Result<types::Filestat> {
fn fd_filestat_get(&self, _fd: types::Fd) -> Result<types::Filestat> {
unimplemented!("fd_filestat_get")
}
fn fd_filestat_set_size(&mut self, _fd: types::Fd, _size: types::Filesize) -> Result<()> {
fn fd_filestat_set_size(&self, _fd: types::Fd, _size: types::Filesize) -> Result<()> {
unimplemented!("fd_filestat_set_size")
}
fn fd_filestat_set_times(
&mut self,
&self,
_fd: types::Fd,
_atim: types::Timestamp,
_mtim: types::Timestamp,
@@ -120,7 +122,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn fd_pread(
&mut self,
&self,
_fd: types::Fd,
_iovs: &types::IovecArray<'_>,
_offset: types::Filesize,
@@ -128,12 +130,12 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("fd_pread")
}
fn fd_prestat_get(&mut self, _fd: types::Fd) -> Result<types::Prestat> {
fn fd_prestat_get(&self, _fd: types::Fd) -> Result<types::Prestat> {
unimplemented!("fd_prestat_get")
}
fn fd_prestat_dir_name(
&mut self,
&self,
_fd: types::Fd,
_path: GuestPtrMut<u8>,
_path_len: types::Size,
@@ -142,7 +144,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn fd_pwrite(
&mut self,
&self,
_fd: types::Fd,
_ciovs: &types::CiovecArray<'_>,
_offset: types::Filesize,
@@ -150,12 +152,12 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("fd_pwrite")
}
fn fd_read(&mut self, _fd: types::Fd, _iovs: &types::IovecArray<'_>) -> Result<types::Size> {
fn fd_read(&self, _fd: types::Fd, _iovs: &types::IovecArray<'_>) -> Result<types::Size> {
unimplemented!("fd_read")
}
fn fd_readdir(
&mut self,
&self,
_fd: types::Fd,
_buf: GuestPtrMut<u8>,
_buf_len: types::Size,
@@ -164,12 +166,12 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("fd_readdir")
}
fn fd_renumber(&mut self, _fd: types::Fd, _to: types::Fd) -> Result<()> {
fn fd_renumber(&self, _fd: types::Fd, _to: types::Fd) -> Result<()> {
unimplemented!("fd_renumber")
}
fn fd_seek(
&mut self,
&self,
_fd: types::Fd,
_offset: types::Filedelta,
_whence: types::Whence,
@@ -177,24 +179,24 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("fd_seek")
}
fn fd_sync(&mut self, _fd: types::Fd) -> Result<()> {
fn fd_sync(&self, _fd: types::Fd) -> Result<()> {
unimplemented!("fd_sync")
}
fn fd_tell(&mut self, _fd: types::Fd) -> Result<types::Filesize> {
fn fd_tell(&self, _fd: types::Fd) -> Result<types::Filesize> {
unimplemented!("fd_tell")
}
fn fd_write(&mut self, _fd: types::Fd, _ciovs: &types::CiovecArray<'_>) -> Result<types::Size> {
fn fd_write(&self, _fd: types::Fd, _ciovs: &types::CiovecArray<'_>) -> Result<types::Size> {
unimplemented!("fd_write")
}
fn path_create_directory(&mut self, _fd: types::Fd, _path: &GuestString<'_>) -> Result<()> {
fn path_create_directory(&self, _fd: types::Fd, _path: &GuestString<'_>) -> Result<()> {
unimplemented!("path_create_directory")
}
fn path_filestat_get(
&mut self,
&self,
_fd: types::Fd,
_flags: types::Lookupflags,
_path: &GuestString<'_>,
@@ -203,7 +205,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn path_filestat_set_times(
&mut self,
&self,
_fd: types::Fd,
_flags: types::Lookupflags,
_path: &GuestString<'_>,
@@ -215,7 +217,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn path_link(
&mut self,
&self,
_old_fd: types::Fd,
_old_flags: types::Lookupflags,
_old_path: &GuestString<'_>,
@@ -226,7 +228,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn path_open(
&mut self,
&self,
_fd: types::Fd,
_dirflags: types::Lookupflags,
_path: &GuestString<'_>,
@@ -239,7 +241,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn path_readlink(
&mut self,
&self,
_fd: types::Fd,
_path: &GuestString<'_>,
_buf: GuestPtrMut<u8>,
@@ -248,12 +250,12 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("path_readlink")
}
fn path_remove_directory(&mut self, _fd: types::Fd, _path: &GuestString<'_>) -> Result<()> {
fn path_remove_directory(&self, _fd: types::Fd, _path: &GuestString<'_>) -> Result<()> {
unimplemented!("path_remove_directory")
}
fn path_rename(
&mut self,
&self,
_fd: types::Fd,
_old_path: &GuestString<'_>,
_new_fd: types::Fd,
@@ -263,7 +265,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn path_symlink(
&mut self,
&self,
_old_path: &GuestString<'_>,
_fd: types::Fd,
_new_path: &GuestString<'_>,
@@ -271,12 +273,12 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("path_symlink")
}
fn path_unlink_file(&mut self, _fd: types::Fd, _path: &GuestString<'_>) -> Result<()> {
fn path_unlink_file(&self, _fd: types::Fd, _path: &GuestString<'_>) -> Result<()> {
unimplemented!("path_unlink_file")
}
fn poll_oneoff(
&mut self,
&self,
_in_: GuestPtr<types::Subscription>,
_out: GuestPtrMut<types::Event>,
_nsubscriptions: types::Size,
@@ -284,24 +286,24 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("poll_oneoff")
}
fn proc_exit(&mut self, _rval: types::Exitcode) -> std::result::Result<(), ()> {
fn proc_exit(&self, _rval: types::Exitcode) -> std::result::Result<(), ()> {
unimplemented!("proc_exit")
}
fn proc_raise(&mut self, _sig: types::Signal) -> Result<()> {
fn proc_raise(&self, _sig: types::Signal) -> Result<()> {
unimplemented!("proc_raise")
}
fn sched_yield(&mut self) -> Result<()> {
fn sched_yield(&self) -> Result<()> {
unimplemented!("sched_yield")
}
fn random_get(&mut self, _buf: GuestPtrMut<u8>, _buf_len: types::Size) -> Result<()> {
fn random_get(&self, _buf: GuestPtrMut<u8>, _buf_len: types::Size) -> Result<()> {
unimplemented!("random_get")
}
fn sock_recv(
&mut self,
&self,
_fd: types::Fd,
_ri_data: &types::IovecArray<'_>,
_ri_flags: types::Riflags,
@@ -310,7 +312,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
}
fn sock_send(
&mut self,
&self,
_fd: types::Fd,
_si_data: &types::CiovecArray<'_>,
_si_flags: types::Siflags,
@@ -318,7 +320,7 @@ impl crate::wasi_snapshot_preview1::WasiSnapshotPreview1 for WasiCtx {
unimplemented!("sock_send")
}
fn sock_shutdown(&mut self, _fd: types::Fd, _how: types::Sdflags) -> Result<()> {
fn sock_shutdown(&self, _fd: types::Fd, _how: types::Sdflags) -> Result<()> {
unimplemented!("sock_shutdown")
}
}