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

Stop bothering WASI apps including unimplemented syscalls #415

Merged
merged 2 commits into from
Jan 16, 2024
Merged

Stop bothering WASI apps including unimplemented syscalls #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
314ee03
Stop preventing WASI apps including unimplemented syscalls
kateinoigakukun Jan 16, 2024
1939718
swift run carton-release hash-archive
kateinoigakukun Jan 16, 2024
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
19 changes: 9 additions & 10 deletions Sources/CartonKit/Server/StaticArchive.swift
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 28 additions & 8 deletions entrypoint/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ export const WasmRunner = (rawOptions, SwiftRuntime) => {
},
});

const createWasmImportObject = (extraWasmImports) => {
const createWasmImportObject = (extraWasmImports, wasmModule) => {
const importObject = {
wasi_snapshot_preview1: wrapWASI(wasi),
wasi_snapshot_preview1: wrapWASI(wasi, wasmModule),
};

if (swift) {
Expand All @@ -72,11 +72,10 @@ export const WasmRunner = (rawOptions, SwiftRuntime) => {
throw new Error("Detected stack buffer overflow.");
},
};
const importObject = createWasmImportObject(extraWasmImports);
const module = await WebAssembly.instantiate(wasmBytes, importObject);

// Node support
const instance = "instance" in module ? module.instance : module;
const module = await WebAssembly.compile(wasmBytes);
const importObject = createWasmImportObject(extraWasmImports, module);
console.log(importObject)
const instance = await WebAssembly.instantiate(module, importObject);

if (swift && instance.exports.swjs_library_version) {
swift.setInstance(instance);
Expand Down Expand Up @@ -132,7 +131,7 @@ const createWasmFS = (onStdout, onStderr) => {
return wasmFs;
};

const wrapWASI = (wasiObject) => {
const wrapWASI = (wasiObject, wasmModule) => {
// PATCH: @wasmer-js/[email protected] forgets to call `refreshMemory` in `clock_res_get`,
// which writes its result to memory view. Without the refresh the memory view,
// it accesses a detached array buffer if the memory is grown by malloc.
Expand All @@ -148,5 +147,26 @@ const wrapWASI = (wasiObject) => {
wasiObject.refreshMemory();
return original_clock_res_get(clockId, resolution);
};

// @wasmer-js/wasi polyfill does not support all WASI syscalls like `sock_accept`.
// So we need to insert a dummy function for unimplemented syscalls.
const __WASI_ERRNO_NOTSUP = 58;
for (const importEntry of WebAssembly.Module.imports(wasmModule)) {
const { importModule, importName, importKind } = importEntry;
// Skip dummy import entries for non-WASI and already implemented syscalls.
if (
importModule !== "wasi_snapshot_preview1" ||
importKind !== "function" ||
wasiObject.wasiImport[importName]
) {
continue;
}

wasiObject.wasiImport[importName] = () => {
console.warn(`WASI syscall ${importModule}.${importName} is not supported, returning ENOTSUP.`);
return __WASI_ERRNO_NOTSUP;
}
}

return wasiObject.wasiImport;
};
Loading