Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
68 changes: 9 additions & 59 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ members = [
"ms_hostcall",
"ms_std_proc_macro",
"ms_std",
"wasi_api",
"wasmtime_wasi_api",
]

Expand Down
9 changes: 4 additions & 5 deletions common_service/ruxfdtab/src/as_apis.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

extern crate alloc;

use std::path::PathBuf;
Expand All @@ -13,7 +12,7 @@ use crate::{
};
use ms_hostcall::{
fdtab::{FdtabError, FdtabResult},
types::{Fd, OpenFlags, OpenMode, Size, Stat, TimeSpec, DirEntry},
types::{DirEntry, Fd, OpenFlags, OpenMode, Size, Stat, TimeSpec},
};
use ruxdriver::init_drivers;
use ruxfdtable::{FileLike, RuxStat};
Expand Down Expand Up @@ -45,7 +44,7 @@ fn convert(ruxstat: RuxStat) -> Stat {
tv_nsec: ruxstat.st_ctime.tv_nsec,
},
__unused: ruxstat.__unused,
}
};
}

fn get_fs_image_path() -> PathBuf {
Expand Down Expand Up @@ -163,7 +162,7 @@ pub fn stat(fd: Fd) -> FdtabResult<Stat> {
let res = convert(stat);
// #[cfg(feature = "log")]
// println!("[DEBUG] stat fd: {:?}, stat: {:?}", fd, res);

Ok(res)
}

Expand All @@ -181,7 +180,7 @@ pub fn readdir(path: &str) -> FdtabResult<Vec<DirEntry>> {
let entry = DirEntry {
dir_path: item.path(),
entry_name: item.file_name(),
entry_type: item.file_type() as u32
entry_type: item.file_type() as u32,
};
entries.push(entry);
}
Expand Down
4 changes: 2 additions & 2 deletions common_service/signal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ crate-type = ["dylib"]
[dependencies]
nc = { version = "0.9.5", default-features = false }
ms_std = { path = "../../ms_std", features = [] }
ms_hostcall = { path = "../../ms_hostcall", features = ["signal"]}
ms_hostcall = { path = "../../ms_hostcall", features = ["signal"] }

[features]
mpk = ["ms_std/mpk"]
default = []
default = []
2 changes: 1 addition & 1 deletion common_service/socket/src/apis.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ pub fn addrinfo(name: &str) -> SmoltcpResult<Ipv4Addr> {
let mut iface = acquire_iface()?;

let (dns_handle, query) = {
let servers = &[Ipv4Address::new(8, 8, 8, 8).into()];
let servers = &[Ipv4Address::new(114, 114, 114, 114).into()];
let dns_socket = dns::Socket::new(servers, vec![]);

let mut sockets = acquire_sockets()?;
Expand Down
26 changes: 0 additions & 26 deletions isol_config/tinywasm.json

This file was deleted.

26 changes: 0 additions & 26 deletions isol_config/tinywasm_c_printf.json

This file was deleted.

30 changes: 0 additions & 30 deletions isol_config/tinywasm_pass_args.json

This file was deleted.

30 changes: 0 additions & 30 deletions isol_config/tinywasm_py.json

This file was deleted.

26 changes: 0 additions & 26 deletions isol_config/tinywasm_write.json

This file was deleted.

2 changes: 1 addition & 1 deletion isol_config/wasmtime_cpython.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"cpython"
],
"args": {
"pyfile_path": "/wasm_bench/alu.py"
"pyfile_path": "/wasm_bench/time.py"
}
}
]
Expand Down
Loading
Loading