@ai-ecoverse/slicc-kernel 1.108.3 → 1.108.4

package/dist/node-process-worker.js

@@ -887,7 +887,7 @@ function pinnedIo(bridge, handle, rewriting) {
     } : {}
   };
 }
-var WasiError, FileBuffer, LocalFile, MAX_LINKS, MISS_TTL_MS, CACHE_CAP, FS_GEN, CRED_GEN, RING, RING_SIZE, SLOT, SHARED_IDS_BYTES, StatCache;
+var WasiError, FileBuffer, LocalFile, MAX_LINKS, MISS_TTL_MS, CACHE_CAP, FS_GEN, CRED_GEN, RING, RING_SIZE, SLOT, FD_RING, FD_RING_SIZE, SHARED_IDS_BYTES, StatCache;
 var init_wasi_files = __esm({
   "src/process/wasi/wasi-files.ts"() {
     "use strict";
@@ -1114,7 +1114,9 @@ var init_wasi_files = __esm({
     RING = 8;
     RING_SIZE = 64;
     SLOT = 3;
-    SHARED_IDS_BYTES = (RING + RING_SIZE * SLOT) * 4;
+    FD_RING = RING + RING_SIZE * SLOT;
+    FD_RING_SIZE = 64;
+    SHARED_IDS_BYTES = (FD_RING + FD_RING_SIZE * 2) * 4;
     StatCache = class {
       stats = /* @__PURE__ */ new Map();
       lstats = /* @__PURE__ */ new Map();
@@ -1886,6 +1888,9 @@ function within(path, root) {
 function kernelEntry() {
   return { type: "kernel", nonblock: false, append: false };
 }
+function ringed(shared) {
+  return shared.length >= FD_RING + FD_RING_SIZE * 2;
+}
 function deviceEntry(meta) {
   return { type: "device", device: meta.device, ...meta.access ? { access: meta.access } : {} };
 }
@@ -2053,16 +2058,44 @@ var init_wasi_fds = __esm({
         this.seen = Atomics.load(ids, GEN);
       }
       sync() {
-        const gen = Atomics.load(this.shared, GEN);
+        const shared = this.shared;
+        const gen = Atomics.load(shared, GEN);
         if (gen === this.seen) return;
-        this.table.clear();
-        this.cloexec.clear();
+        if (!this.replay(shared, gen)) {
+          this.table.clear();
+          this.cloexec.clear();
+        }
         this.seen = gen;
       }
-      bump() {
+      replay(shared, upTo) {
+        if (upTo - this.seen > FD_RING_SIZE || !ringed(shared)) return false;
+        const changed2 = [];
+        for (let g = this.seen + 1; g <= upTo; g++) {
+          const at = FD_RING + g % FD_RING_SIZE * 2;
+          if (Atomics.load(shared, at) !== g) return false;
+          const fd = Atomics.load(shared, at + 1);
+          if (fd < 0 || Atomics.load(shared, at) !== g) return false;
+          changed2.push(fd);
+        }
+        for (const fd of changed2) {
+          this.table.delete(fd);
+          this.cloexec.delete(fd);
+        }
+        return true;
+      }
+      bump(...fds) {
         if (!this.shared) return;
-        const gen = Atomics.add(this.shared, GEN, 1) + 1;
-        if (gen - 1 === this.seen) this.seen = gen;
+        const shared = this.shared;
+        for (const fd of fds.length > 0 ? fds : [-1]) {
+          const gen = Atomics.add(shared, GEN, 1) + 1;
+          if (ringed(shared)) {
+            const at = FD_RING + gen % FD_RING_SIZE * 2;
+            Atomics.store(shared, at, 0);
+            Atomics.store(shared, at + 1, fd);
+            Atomics.store(shared, at, gen);
+          }
+          if (gen - 1 === this.seen) this.seen = gen;
+        }
       }
       stdioEntry(fd) {
         let info;
@@ -2105,7 +2138,7 @@ var init_wasi_fds = __esm({
           e.append = append;
           if (this.shared) {
             this.publishFlags(fd, e);
-            this.bump();
+            this.bump(fd);
           }
         } else if (e.type === "file") e.file.append = append;
       }
@@ -2115,7 +2148,7 @@ var init_wasi_fds = __esm({
         else this.cloexec.delete(fd);
         if (this.shared) {
           this.kernel.call({ op: "fd-cloexec", fd, on });
-          this.bump();
+          this.bump(fd);
         }
       }
       cwd() {
@@ -2132,7 +2165,7 @@ var init_wasi_fds = __esm({
       adopt(fd, kind, nonblock, dgram = false) {
         this.table.set(fd, { type: "kernel", kind, dgram, nonblock, append: false });
         if (this.shared && nonblock) this.publishFlags(fd, { nonblock, append: false });
-        this.bump();
+        this.bump(fd);
       }
       get(fd) {
         const e = this.find(fd);
@@ -2157,7 +2190,7 @@ var init_wasi_fds = __esm({
           ...meta ? { meta } : {}
         });
         this.table.set(fd, e);
-        this.bump();
+        this.bump(fd);
         return fd;
       }
       cloexec = /* @__PURE__ */ new Set();
@@ -2173,14 +2206,14 @@ var init_wasi_fds = __esm({
           at = this.install(e.type === "file" ? e : { ...e }, min);
         }
         if (cloexec) this.setCloexec(at, true);
-        this.bump();
+        this.bump(at);
         return at;
       }
       pipe() {
         const [r, w] = this.kernel.sys.pipe();
         this.table.set(r, { type: "kernel", kind: "stream", nonblock: false, append: false });
         this.table.set(w, { type: "kernel", kind: "stream", nonblock: false, append: false });
-        this.bump();
+        this.bump(r, w);
         return [r, w];
       }
       chdir(path) {
@@ -2280,7 +2313,7 @@ var init_wasi_fds = __esm({
         } finally {
           this.release(e);
           this.dropLocks(e);
-          this.bump();
+          this.bump(fd);
         }
       }
       renumber(from, to, keep = false) {
@@ -2299,7 +2332,7 @@ var init_wasi_fds = __esm({
         }
         if (old) this.release(old);
         this.dropLocks(old);
-        this.bump();
+        this.bump(from, to);
       }
       release(e) {
         if (e.type !== "file" || --e.file.refs > 0) return;
@@ -2487,7 +2520,6 @@ var init_wasi_fds = __esm({
           kind = "tty";
         } else return void 0;
         this.adopt(fd, kind, nonblock);
-        this.bump();
         return fd;
       }
       openCharDevice(openDevice2, oflags, rights) {
@@ -2612,7 +2644,7 @@ var init_wasi_fds = __esm({
         if (truncate) this.fs.touched?.(path, ino);
         this.table.set(fd, { type: "kernel", kind: "file", nonblock: false, append, path, ino });
         if (append) this.publishFlags(fd, { nonblock: false, append });
-        this.bump();
+        this.bump(fd);
         return fd;
       }
       createNew(path, oflags, mode) {
@@ -2648,7 +2680,7 @@ var init_wasi_fds = __esm({
         if (e.type === "kernel") {
           const at = this.kernel.call({ op: "fd-dup", fd });
           this.table.set(at, { ...e });
-          this.bump();
+          this.bump(at);
           return at;
         }
         if (e.type === "file") e.file.refs++;
@@ -3689,6 +3721,7 @@ var init_wasi_host = __esm({
       muted;
       signals;
       sigmask;
+      tid = 1;
       linkedTls;
       threadEntry;
       linkedModules;
@@ -4378,14 +4411,13 @@ var init_wasi_host = __esm({
       brokenPipe() {
         let action;
         try {
-          action = this.o.kernel.call({ op: "proc-kill-self", sig: SIG.PIPE, probe: true });
+          action = this.o.kernel.call({ op: "proc-kill-self", sig: SIG.PIPE, dry: true });
         } catch {
           action = "terminate";
         }
-        if (action !== "terminate") return;
-        const mask = this.sigmask;
-        if (!mask?.blocks(SIG.PIPE)) throw new WasiExit(SIGPIPE_EXIT);
-        this.o.kernel.call({ op: "thread-kill", tid: mask.tid, sig: SIG.PIPE });
+        if (action === "ignore") return;
+        if (action === "terminate" && !this.sigmask?.blocks(SIG.PIPE)) throw new WasiExit(SIGPIPE_EXIT);
+        this.o.kernel.call({ op: "thread-kill", tid: this.tid, sig: SIG.PIPE });
       }
       read(fd, max) {
         const e = this.fds.get(fd);
@@ -5172,7 +5204,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.108.3" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.108.4" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -16033,6 +16065,7 @@ async function runWasiThread(init, port3) {
     ),
     shared: threads.ids
   });
+  host.tid = thread.tid;
   host.sigmask = sigmaskOf(init.program.module, init.sab, gate, threads, init.signals);
   const program = await programImports(init.program, host, transport, thread.tid);
   const { module } = init.program;