Skip to content
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

wasix: Switch Console to WasiRunner + Various WASI Improvements #3996

Closed
wants to merge 16 commits into from
Closed

wasix: Switch Console to WasiRunner + Various WASI Improvements #3996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
7c78673
chore: Remove unused name_map from WasiFs
theduke Jun 13, 2023
a699a7b
wasix: Allow passing a custom root fs to WasiRunner/CommonWasiOptions
theduke Jun 13, 2023
fcf59c8
wasix: Switch the Console over to the WasiRunner
theduke Jun 13, 2023
2985c5b
chore: remove redundant webc_runner[_wasi] features
theduke Jun 13, 2023
c98af52
feat(wasix): Extend Runtime trait with module loading/compiling
theduke Jun 13, 2023
cc16f31
wasix: use common Runtime::laod_module helper in spawn_exec
theduke Jun 13, 2023
d17a144
Use async load_module() to prevent tokio nested runtime panic
theduke Jun 14, 2023
c31327f
chore: improve logging in bin_factory
theduke Jun 21, 2023
4065b41
tests(wasix): Add execution test for Console
theduke Jun 21, 2023
1da1ac2
wasix: Improve SpawnError::Other
theduke Jun 21, 2023
71a9b9b
cli: Use Runtime::load_module_sync in runners
theduke Jun 21, 2023
5240d34
tests(wasix): Constraint Console test
theduke Jun 22, 2023
63d223d
chore(wasix): Cleanup of various review suggestions
theduke Jun 22, 2023
c275362
tests: Fix console dash test
theduke Jul 5, 2023
13b840a
tests: Set package loader for tests
theduke Jul 6, 2023
5363d5b
Merge remote-tracking branch 'origin/master' into wasix-console-impro…
theduke Jul 21, 2023
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
2 changes: 1 addition & 1 deletion lib/wasix/src/os/console/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use crate::{
capabilities::Capabilities,
os::task::{control_plane::WasiControlPlane, process::WasiProcess},
runtime::{resolver::PackageSpecifier, task_manager::InlineWaker},
Runtime, SpawnError, WasiEnv, WasiEnvBuilder, WasiRuntimeError,
Runtime, SpawnError, VirtualTaskManagerExt, WasiEnv, WasiEnvBuilder, WasiRuntimeError,
};

#[derive(Derivative)]
Expand Down
1 change: 1 addition & 0 deletions lib/wasix/src/runtime/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ pub mod package_loader;
pub mod resolver;
pub mod task_manager;

use self::module_cache::{CacheError, ModuleHash};
pub use self::task_manager::{SpawnMemoryType, VirtualTaskManager};
use self::{
module_cache::{CacheError, ModuleHash},
Expand Down
2 changes: 2 additions & 0 deletions lib/wasix/tests/runners.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,8 @@ fn runtime() -> impl Runtime + Send + Sync {
let tasks = TokioTaskManager::new(Handle::current());
let mut rt = PluggableRuntime::new(Arc::new(tasks));

rt.set_package_loader(BuiltinPackageLoader::from_env().unwrap());

let cache =
SharedCache::default().with_fallback(FileSystemCache::new(tmp_dir().join("compiled")));

Expand Down