@ai-ecoverse/slicc-kernel 1.17.1 → 1.17.3

package/dist/node-process-worker.js

@@ -1761,6 +1761,19 @@ function cloexecPipe2(pipe2, deps) {
     return r;
   };
 }
+function quietTarget(dup3, deps) {
+  return (fd = -1, newfd = -1, flags = 0, ...rest) => {
+    const Fs = deps.fs();
+    const target = fd === newfd || flags !== 0 ? void 0 : Fs?.getStream(newfd);
+    if (target && Fs?.getStream(fd)) {
+      try {
+        Fs.close?.(target);
+      } catch {
+      }
+    }
+    return dup3(fd, newfd, flags, ...rest);
+  };
+}
 function cloexecByFlag(syscall, flagArg, deps) {
   const mark = marker(deps);
   return (...args) => {
@@ -1777,7 +1790,7 @@ function wrapperFactories(deps) {
     ...timer ? { setitimer: (f) => kernelTimer(f, timer) } : {},
     fcntl: (f) => cloexecFcntl(f, deps),
     pipe2: (f) => cloexecPipe2(f, deps),
-    dup3: (f) => cloexecByFlag(f, 2, deps),
+    dup3: (f) => cloexecByFlag(quietTarget(f, deps), 2, deps),
     socket: (f) => cloexecByFlag(f, 1, deps),
     accept4: (f) => cloexecByFlag(f, 3, deps),
     ...pty ? { ioctl: (f) => ptyIoctl(f, { fs: deps.fs, heap: deps.heap, kernel: pty }) } : {}
@@ -2749,7 +2762,7 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
     };
     return node;
   };
-  const find = (processes2, target, own) => processes2.find((p) => own ? p.tid === target : p.pid === target || p.tid === target);
+  const find = (processes2, target, own) => (own ? processes2.find((p) => p.tid === target) : void 0) ?? processes2.find((p) => p.pid === target || p.tid === target);
   const infoOf = (target) => find(procList().processes, target, false);
   const pidContent = (target, name, own = false) => () => {
     const listing = procList();
@@ -3358,20 +3371,20 @@ function pathInode(path) {
   }
   return h;
 }
-function cachingBridge(bridge) {
+function cachingBridge(bridge, now = () => performance.now()) {
   const stats = /* @__PURE__ */ new Map();
   const lstats = /* @__PURE__ */ new Map();
   const cached = (map, path, get) => {
     let hit = map.get(path);
-    if (hit === void 0) {
+    if (hit === void 0 || "until" in hit && hit.until <= now()) {
       try {
         hit = get();
       } catch (e) {
-        hit = e;
+        hit = { error: e, until: now() + MISS_TTL_MS };
       }
       map.set(path, hit);
     }
-    if (hit instanceof Error) throw hit;
+    if ("until" in hit) throw hit.error;
     return hit;
   };
   const invalidate = () => {
@@ -3421,7 +3434,7 @@ function cachingBridge(bridge) {
     invalidate
   };
 }
-var WasiError, FileBuffer, LocalFile;
+var WasiError, FileBuffer, LocalFile, MISS_TTL_MS;
 var init_wasi_files = __esm({
   "src/process/wasi/wasi-files.ts"() {
     "use strict";
@@ -3550,6 +3563,7 @@ var init_wasi_files = __esm({
         this.buffer.flush();
       }
     };
+    MISS_TTL_MS = 20;
   }
 });
 
@@ -4312,27 +4326,30 @@ function pollOneoff(deps, inPtr, outPtr, nsubs, neventsPtr) {
   const subs = readSubscriptions(mem, inPtr, nsubs, deps.now);
   const { events, read, write } = classify(deps.fds, subs);
   let interrupted = false;
+  const earliest = subs.reduce((min, s) => Math.min(min, s.deadline), Infinity);
+  const expired = () => performance.now() + CLOCK_SLACK_MS >= earliest;
   if (read.length > 0 || write.length > 0 || events.length === 0) {
-    const earliest = Math.min(...subs.map((s) => s.deadline));
-    let timeoutMs = -1;
-    if (events.length > 0) timeoutMs = 0;
-    else if (earliest !== Infinity)
-      timeoutMs = Math.max(0, Math.ceil(earliest - performance.now()));
-    let ready;
-    try {
-      ready = kernel.call({ op: "fd-select", read, write, timeoutMs });
-    } catch (e) {
-      if (!deps.interruptWakes || e.code !== "EINTR") throw e;
-      interrupted = true;
-      ready = { read: [], write: [] };
-    }
-    events.push(
-      ...readyEvents(subs, ready)
-    );
+    do {
+      let timeoutMs = -1;
+      if (events.length > 0) timeoutMs = 0;
+      else if (earliest !== Infinity)
+        timeoutMs = Math.max(0, Math.ceil(earliest - performance.now()));
+      let ready;
+      try {
+        ready = kernel.call({ op: "fd-select", read, write, timeoutMs });
+      } catch (e) {
+        if (!deps.interruptWakes || e.code !== "EINTR") throw e;
+        interrupted = true;
+        ready = { read: [], write: [] };
+      }
+      events.push(
+        ...readyEvents(subs, ready)
+      );
+    } while (events.length === 0 && !interrupted && earliest !== Infinity && !expired());
   }
   const after = performance.now();
   for (const s of subs) {
-    if (s.type === EVENTTYPE.CLOCK && (interrupted || s.deadline <= after + 0.5)) {
+    if (s.type === EVENTTYPE.CLOCK && (interrupted || s.deadline <= after + CLOCK_SLACK_MS)) {
       events.push({ userdata: s.userdata, error: E.SUCCESS, type: s.type });
     }
   }
@@ -4340,10 +4357,12 @@ function pollOneoff(deps, inPtr, outPtr, nsubs, neventsPtr) {
   mem.view().setUint32(neventsPtr, events.length, true);
   return E.SUCCESS;
 }
+var CLOCK_SLACK_MS;
 var init_wasi_poll = __esm({
   "src/process/wasi/wasi-poll.ts"() {
     "use strict";
     init_wasi_abi();
+    CLOCK_SLACK_MS = 0.5;
   }
 });
 
@@ -4471,19 +4490,25 @@ var init_wasi_host = __esm({
           ...this.statImports(),
           ...this.pathImports(),
           ...this.socketImports(),
-          poll_oneoff: (inPtr, outPtr, n, nevents) => pollOneoff(
-            {
-              mem: this.mem,
-              fds: this.fds,
-              kernel: this.o.kernel,
-              now: (id) => this.now(id),
-              interruptWakes: this.interruptWakes
-            },
-            inPtr,
-            outPtr,
-            n,
-            nevents
-          )
+          poll_oneoff: (inPtr, outPtr, n, nevents) => {
+            try {
+              return pollOneoff(
+                {
+                  mem: this.mem,
+                  fds: this.fds,
+                  kernel: this.o.kernel,
+                  now: (id) => this.now(id),
+                  interruptWakes: this.interruptWakes
+                },
+                inPtr,
+                outPtr,
+                n,
+                nevents
+              );
+            } finally {
+              this.o.fs.invalidate?.();
+            }
+          }
         });
         return this.cache;
       }