+ #### +
+ + + + diff --git a/threads/examples/wasi_workers/index.ts b/threads/examples/wasi_workers/index.ts new file mode 100644 index 0000000..0df777d --- /dev/null +++ b/threads/examples/wasi_workers/index.ts @@ -0,0 +1,41 @@ +import { + OpenFile, + File, + ConsoleStdout, + PreopenDirectory, + type Inode, + Directory, +} from "@bjorn3/browser_wasi_shim"; +import { WASIFarm } from "../../src"; + +const worker = new Worker("./worker.ts", { type: "module" }); +worker.onmessage = (event) => { + const { wasi_ref: wasi_ref2 } = event.data; + + (async () => { + const current_directory = new Map+ Note: the failure to invoke the linker at the end is expected. + WASI doesn't have a way to invoke external processes and rustc doesn't have a builtin linker. + This demo highlights how far `rustc` can get on this polyfill before failing due to other reasons. +
+ + + + diff --git a/threads/examples/wasi_workers_rustc/index.ts b/threads/examples/wasi_workers_rustc/index.ts new file mode 100644 index 0000000..4d9bf7a --- /dev/null +++ b/threads/examples/wasi_workers_rustc/index.ts @@ -0,0 +1,195 @@ +import { WASIFarm } from "../../src"; +import { + Directory, + Fd, + File, + type Inode, + PreopenDirectory, +} from "@bjorn3/browser_wasi_shim"; +import { Terminal } from "@xterm/xterm"; +import { FitAddon } from "xterm-addon-fit"; +import "@xterm/xterm/css/xterm.css"; + +const term = new Terminal({ + convertEol: true, +}); +const terminalElement = document.getElementById("terminal"); +if (!terminalElement) { + throw new Error("Terminal element not found"); +} +term.open(terminalElement); + +const fitAddon = new FitAddon(); +term.loadAddon(fitAddon); +fitAddon.fit(); + +class XtermStdio extends Fd { + /*:: term: Terminal*/ + term: Terminal; + + constructor(term: Terminal) { + super(); + this.term = term; + } + fd_write(data /*: Uint8Array*/) /*: {ret: number, nwritten: number}*/ { + console.log(data); + this.term.write(new TextDecoder().decode(data)); + return { ret: 0, nwritten: data.byteLength }; + } +} + +term.writeln("\x1B[93mDownloading\x1B[0m"); +//let wasm = await WebAssembly.compileStreaming(fetch("/rust_out.wasm")); +term.writeln("\x1B[93mInstantiating\x1B[0m"); + +async function load_external_file(path) { + return new File(await (await (await fetch(path)).blob()).arrayBuffer()); +} + +const toMap = (arr: Array<[string, Inode]>) => { + const map = new MapDownload object`; +let content2: Inode | undefined; +while (true) { + content2 = fds[2].dir.contents.get("hello.allocator_shim.rcgu.o"); + if (content2) { + break; + } + await new Promise((resolve) => setTimeout(resolve, 1000)); +} +await new Promise((resolve) => setTimeout(resolve, 1000)); +downloadsElement.innerHTML += `
Download allocator shim`; diff --git a/threads/examples/wasi_workers_rustc/worker.ts b/threads/examples/wasi_workers_rustc/worker.ts new file mode 100644 index 0000000..9b8e2ee --- /dev/null +++ b/threads/examples/wasi_workers_rustc/worker.ts @@ -0,0 +1,76 @@ +import { strace } from "@bjorn3/browser_wasi_shim"; +import { WASIFarmAnimal } from "../../src"; + +console.log("worker.js"); + +globalThis.onmessage = async (e) => { + const wasm = await WebAssembly.compileStreaming( + fetch( + "../wasi_multi_threads_rustc/rust_wasm/rustc_cranelift/rustc_opt.wasm", + ), + ); + + console.log("worker.js onmessage", e.data); + + const { wasi_ref } = e.data; + + const args = [ + "rustc", + "/hello.rs", + "--sysroot", + "/sysroot", + "--target", + "x86_64-unknown-linux-gnu", + "-Cpanic=abort", + "-Ccodegen-units=1", + ]; + const env = ["RUSTC_LOG=info"]; + + console.log("wasi_ref", wasi_ref); + + const w = new WASIFarmAnimal(wasi_ref, args, env, {}); + + let next_thread_id = 1; + + const inst = (await WebAssembly.instantiate(wasm, { + env: { + memory: new WebAssembly.Memory({ + initial: 256, + maximum: 16384, + shared: true, + }), + }, + wasi: { + "thread-spawn": (start_arg) => { + console.log("thread-spawn", start_arg); + + const thread_id = next_thread_id++; + inst.exports.wasi_thread_start(thread_id, start_arg); + return thread_id; + }, + }, + wasi_snapshot_preview1: strace(w.wasiImport, ["fd_prestat_get"]), + })) as unknown as { + exports: { + wasi_thread_start: (thread_id: number, start_arg: number) => void; + memory: WebAssembly.Memory; + _start: () => unknown; + }; + }; + + postMessage({ + term: "\x1B[93mExecuting\x1B[0m", + }); + console.log(inst.exports); + try { + w.start(inst); + } catch (e) { + postMessage({ + term: `Exception: ${e.message}`, + }); + // /*term.writeln("backtrace:"); term.writeln(e.stack);*/ + } + postMessage({ + term: "\x1B[92mDone\x1B[0m", + }); +}; diff --git a/threads/examples/wasi_workers_single/echo_and_rewrite.wasm b/threads/examples/wasi_workers_single/echo_and_rewrite.wasm new file mode 100644 index 0000000..d03ed2d Binary files /dev/null and b/threads/examples/wasi_workers_single/echo_and_rewrite.wasm differ diff --git a/threads/examples/wasi_workers_single/index.html b/threads/examples/wasi_workers_single/index.html new file mode 100644 index 0000000..c911479 --- /dev/null +++ b/threads/examples/wasi_workers_single/index.html @@ -0,0 +1,11 @@ + + + + + +
+ #### +
+ + + diff --git a/threads/examples/wasi_workers_single/index.ts b/threads/examples/wasi_workers_single/index.ts new file mode 100644 index 0000000..255d858 --- /dev/null +++ b/threads/examples/wasi_workers_single/index.ts @@ -0,0 +1,43 @@ +import { + OpenFile, + File, + WASI, + ConsoleStdout, + PreopenDirectory, +} from "@bjorn3/browser_wasi_shim"; + +// sleep 1000 +await new Promise((resolve) => setTimeout(resolve, 1000)); + +const toMap = (arr: Array<[string, File]>) => new Mapall link
+-
+
- wasi_multi_threads +
- wasi_multi_threads_channel +
- wasi_multi_threads_rustc +
- wasi_workers +
- wasi_workers_rustc +
- wasi_workers_single +