Skip to content

Enable the os and io modules on wasi #1872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Enable the os and io modules on wasi #1872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion vm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,15 @@ crc32fast = "1.2.0"
adler32 = "1.0.3"
gethostname = "0.2.0"
subprocess = "0.2.2"
num_cpus = "1"
socket2 = { version = "0.3", features = ["unix"] }
rustyline = "6.0"
openssl = { version = "0.10", features = ["vendored"] }
openssl-sys = "0.9"
openssl-probe = "0.1"

[target.'cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))'.dependencies]
num_cpus = "1"

[target.'cfg(not(any(target_arch = "wasm32", target_os = "redox")))'.dependencies]
dns-lookup = "1.0"
flate2 = { version = "1.0", features = ["zlib"], default-features = false }
Expand Down
20 changes: 3 additions & 17 deletions vm/src/stdlib/io.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,7 +516,7 @@ fn buffered_reader_close(instance: PyObjectRef, vm: &VirtualMachine) -> PyResult
}

// disable FileIO on WASM
#[cfg(not(target_arch = "wasm32"))]
#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
mod fileio {
use super::super::os;
use super::*;
Expand Down Expand Up @@ -658,23 +658,9 @@ mod fileio {
Ok(len)
}

#[cfg(windows)]
fn file_io_close(instance: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
let raw_handle = i64::try_from_object(vm, vm.get_attribute(instance.clone(), "__fileno")?)?;
unsafe {
winapi::um::handleapi::CloseHandle(raw_handle as _);
}
vm.set_attr(&instance, "closefd", vm.new_bool(true))?;
vm.set_attr(&instance, "__closed", vm.new_bool(true))?;
Ok(())
}

#[cfg(unix)]
fn file_io_close(instance: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
let raw_fd = i64::try_from_object(vm, vm.get_attribute(instance.clone(), "__fileno")?)?;
unsafe {
libc::close(raw_fd as _);
}
drop(os::rust_file(raw_handle));
vm.set_attr(&instance, "closefd", vm.new_bool(true))?;
vm.set_attr(&instance, "__closed", vm.new_bool(true))?;
Ok(())
Expand Down Expand Up @@ -1051,7 +1037,7 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
"DEFAULT_BUFFER_SIZE" => ctx.new_int(8 * 1024),
});

#[cfg(not(target_arch = "wasm32"))]
#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
extend_module!(vm, module, {
"FileIO" => fileio::make_fileio(ctx, raw_io_base),
});
Expand Down
6 changes: 4 additions & 2 deletions vm/src/stdlib/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ mod unicodedata;
mod warnings;
mod weakref;

#[cfg(not(target_arch = "wasm32"))]
#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
#[macro_use]
mod os;

Expand Down Expand Up @@ -112,10 +112,12 @@ pub fn get_module_inits() -> HashMap<String, StdlibInitFunc> {
modules.insert("symtable".to_owned(), Box::new(symtable::make_module));
}

#[cfg(any(unix, windows, target_os = "wasi"))]
modules.insert(os::MODULE_NAME.to_owned(), Box::new(os::make_module));

// disable some modules on WASM
#[cfg(not(target_arch = "wasm32"))]
{
modules.insert(os::MODULE_NAME.to_owned(), Box::new(os::make_module));
modules.insert("_socket".to_owned(), Box::new(socket::make_module));
modules.insert(
"_multiprocessing".to_owned(),
Expand Down
49 changes: 35 additions & 14 deletions vm/src/stdlib/os.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,24 @@ pub fn rust_file(raw_fileno: i64) -> File {
unsafe { File::from_raw_handle(raw_fileno) }
}

#[cfg(all(not(unix), not(windows)))]
#[cfg(target_os = "wasi")]
pub fn raw_file_number(handle: File) -> i64 {
// This should be safe, since the wasi api is pretty well defined, but once
// `wasi_ext` get's stabilized, we should use that instead.
unsafe { std::mem::transmute::<_, u32>(handle).into() }
}

#[cfg(target_os = "wasi")]
pub fn rust_file(raw_fileno: i64) -> File {
unsafe { std::mem::transmute(raw_fileno as u32) }
}

#[cfg(not(any(unix, windows, target_os = "wasi")))]
pub fn rust_file(raw_fileno: i64) -> File {
unimplemented!();
}

#[cfg(all(not(unix), not(windows)))]
#[cfg(not(any(unix, windows, target_os = "wasi")))]
pub fn raw_file_number(handle: File) -> i64 {
unimplemented!();
}
Expand Down Expand Up @@ -168,8 +180,10 @@ fn os_close(fileno: i64) {
type OpenFlags = i32;
#[cfg(windows)]
type OpenFlags = u32;
#[cfg(target_os = "wasi")]
type OpenFlags = u16;

#[cfg(any(unix, windows))]
#[cfg(any(unix, windows, target_os = "wasi"))]
pub fn os_open(
name: PyStringRef,
flags: OpenFlags,
Expand Down Expand Up @@ -213,6 +227,7 @@ pub fn os_open(
#[cfg(windows)]
let flags = flags & !(libc::O_WRONLY as u32);

#[cfg(not(target_os = "wasi"))]
options.custom_flags(flags);
let handle = options
.open(fname)
Expand All @@ -221,7 +236,7 @@ pub fn os_open(
Ok(raw_file_number(handle))
}

#[cfg(all(not(unix), not(windows)))]
#[cfg(not(any(unix, windows, target_os = "wasi")))]
pub fn os_open(vm: &VirtualMachine, args: PyFuncArgs) -> PyResult {
unimplemented!()
}
Expand Down Expand Up @@ -490,7 +505,7 @@ fn bytes_as_osstr<'a>(b: &'a [u8], vm: &VirtualMachine) -> PyResult<&'a ffi::OsS
use std::os::unix::ffi::OsStrExt;
Some(ffi::OsStr::from_bytes(b))
}
#[cfg(windows)]
#[cfg(not(unix))]
{
std::str::from_utf8(b).ok().map(|s| s.as_ref())
}
Expand Down Expand Up @@ -889,9 +904,10 @@ fn os_stat(
windows
)))]
fn os_stat(
_file: Either<PyStringRef, i64>,
file: Either<PyPathLike, i64>,
_dir_fd: DirFd,
_follow_symlinks: FollowSymlinks,
follow_symlinks: FollowSymlinks,
vm: &VirtualMachine,
) -> PyResult {
unimplemented!();
}
Expand Down Expand Up @@ -978,6 +994,10 @@ fn os_get_inheritable(fd: RawFd, vm: &VirtualMachine) -> PyResult<bool> {
}

fn os_set_inheritable(fd: i64, inheritable: bool, vm: &VirtualMachine) -> PyResult<()> {
#[cfg(not(any(unix, windows)))]
{
unimplemented!()
}
#[cfg(unix)]
{
let fd = fd as RawFd;
Expand Down Expand Up @@ -1523,11 +1543,13 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
"supports_follow_symlinks" => supports_follow_symlinks.into_object(),
});

extend_module_platform_specific(&vm, module)
extend_module_platform_specific(&vm, &module);

module
}

#[cfg(unix)]
fn extend_module_platform_specific(vm: &VirtualMachine, module: PyObjectRef) -> PyObjectRef {
fn extend_module_platform_specific(vm: &VirtualMachine, module: &PyObjectRef) {
let ctx = &vm.ctx;

let uname_result = UnameResult::make_class(ctx);
Expand Down Expand Up @@ -1611,16 +1633,15 @@ fn extend_module_platform_specific(vm: &VirtualMachine, module: PyObjectRef) ->
extend_module!(vm, module, {
"pipe2" => ctx.new_function(os_pipe2),
});

module
}

#[cfg(windows)]
fn extend_module_platform_specific(vm: &VirtualMachine, module: PyObjectRef) -> PyObjectRef {
fn extend_module_platform_specific(vm: &VirtualMachine, module: &PyObjectRef) {
let ctx = &vm.ctx;
extend_module!(vm, module, {
"O_BINARY" => ctx.new_int(libc::O_BINARY),
});

module
}

#[cfg(not(any(unix, windows)))]
fn extend_module_platform_specific(_vm: &VirtualMachine, _module: &PyObjectRef) {}
2 changes: 1 addition & 1 deletion vm/src/vm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ impl VirtualMachine {

import::init_importlib(self, initialize_parameter)?;

#[cfg(not(target_arch = "wasm32"))]
#[cfg(any(not(target_arch = "wasm32"), target_os = "wasi"))]
{
let io = self.import("io", &[], 0)?;
let io_open = self.get_attribute(io.clone(), "open")?;
Expand Down