@ai-ecoverse/slicc-kernel 1.125.5 → 1.125.8

package/dist/node-process-worker.js

@@ -932,7 +932,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, FD_RING, FD_RING_SIZE, SHARED_IDS_BYTES, StatCache, SEEN_CAP, SeenAt, remember;
+var WasiError, FileBuffer, LocalFile, MAX_LINKS, MISS_TTL_MS, CACHE_CAP, FS_GEN, CRED_GEN, UMASK, RING, RING_SIZE, SLOT, FD_RING, FD_RING_SIZE, SHARED_IDS_BYTES, StatCache, SEEN_CAP, SeenAt, remember;
 var init_wasi_files = __esm({
   "src/process/wasi/wasi-files.ts"() {
     "use strict";
@@ -1162,6 +1162,7 @@ var init_wasi_files = __esm({
     CACHE_CAP = 8192;
     FS_GEN = 4;
     CRED_GEN = 5;
+    UMASK = 6;
     RING = 8;
     RING_SIZE = 64;
     SLOT = 3;
@@ -2703,7 +2704,7 @@ var init_slicc_sem = __esm({
 });
 
 // src/process/wasi/wasi-cred.ts
-var CredCache;
+var CredCache, KNOWN, LOCKED, UNGATED, UmaskCache;
 var init_wasi_cred = __esm({
   "src/process/wasi/wasi-cred.ts"() {
     "use strict";
@@ -2741,6 +2742,69 @@ var init_wasi_cred = __esm({
         return cred;
       }
     };
+    KNOWN = 65536;
+    LOCKED = 131072;
+    UNGATED = { quiet: (fn) => fn(), deliver: () => {
+    } };
+    UmaskCache = class {
+      mask;
+      call;
+      shared;
+      signals;
+      constructor(call2, shared, signals = UNGATED) {
+        this.call = call2;
+        this.shared = shared;
+        this.signals = signals;
+      }
+      get() {
+        const { shared } = this;
+        if (!shared) {
+          this.mask ??= this.call();
+          return this.mask;
+        }
+        for (; ; ) {
+          const seen = Atomics.load(shared, UMASK);
+          if (seen & LOCKED) Atomics.wait(shared, UMASK, seen);
+          else if (seen & KNOWN) return seen & 511;
+          else {
+            const mask = this.call();
+            if (Atomics.compareExchange(shared, UMASK, 0, mask | KNOWN) === 0) return mask;
+          }
+        }
+      }
+      set(mask) {
+        try {
+          return this.signals.quiet(() => this.change(mask));
+        } finally {
+          this.signals.deliver();
+        }
+      }
+      change(mask) {
+        const { shared } = this;
+        if (!shared) {
+          const old = this.call(mask);
+          this.mask = mask & 511;
+          return old;
+        }
+        const seen = this.lock(shared);
+        let next2 = seen;
+        try {
+          const old = this.call(mask);
+          next2 = mask & 511 | KNOWN;
+          return old;
+        } finally {
+          Atomics.store(shared, UMASK, next2);
+          Atomics.notify(shared, UMASK);
+        }
+      }
+      lock(shared) {
+        for (; ; ) {
+          const seen = Atomics.load(shared, UMASK);
+          if (seen & LOCKED) Atomics.wait(shared, UMASK, seen);
+          else if (Atomics.compareExchange(shared, UMASK, seen, seen | LOCKED) === seen) return seen;
+        }
+      }
+    };
   }
 });
 
@@ -4702,6 +4766,7 @@ var init_wasi_host = __esm({
       mem = new WasiMemory();
       fds;
       creds;
+      umasks;
       started = performance.now();
       cache;
       startCwd;
@@ -4719,7 +4784,8 @@ var init_wasi_host = __esm({
       threadEntry;
       linkedModules;
       interrupted;
-      quietly = (fn) => fn();
+      quietly = UNGATED.quiet;
+      deliverDue = UNGATED.deliver;
       listening;
       o;
       constructor(o) {
@@ -4745,6 +4811,13 @@ var init_wasi_host = __esm({
           () => this.o.kernel.call({ op: "proc-cred" }),
           o.credGen ?? o.shared
         );
+        this.umasks = new UmaskCache(
+          (mask) => this.o.kernel.call(
+            mask === void 0 ? { op: "proc-umask" } : { op: "proc-umask", mask }
+          ),
+          o.credGen ?? o.shared,
+          { quiet: (fn) => this.quietly(fn), deliver: () => this.deliverDue() }
+        );
         if (o.shared) this.fds.share(o.shared, true);
         else if (o.forked) this.fds.restore(o.forked.fds, o.forked.cloexec);
         else this.fds.setup(o.cwd, o.inherited ?? [], o.preopenRoot === true);
@@ -4753,8 +4826,11 @@ var init_wasi_host = __esm({
       get cwd() {
         return this.fds.cwd() ?? this.startCwd;
       }
+      umask(mask) {
+        return mask === void 0 ? this.umasks.get() : this.umasks.set(mask);
+      }
       created(path, mode) {
-        const umask = this.o.kernel.call({ op: "proc-umask" });
+        const umask = this.umasks.get();
         if (umask !== DEFAULT_UMASK) this.o.fs.chmod(path, mode & ~umask);
       }
       sliccTtyImports() {
@@ -4884,7 +4960,7 @@ var init_wasi_host = __esm({
             const raw = mem.string(p, l);
             if (raw === "") throw new WasiError("ENOENT");
             const path = dirfd === AT_FDCWD && !raw.startsWith("/") ? fds.resolve(3, `${this.cwd}/${raw}`) : at(dirfd, p, l);
-            const umask = this.o.kernel.call({ op: "proc-umask" });
+            const umask = this.umasks.get();
             const want = mode & 4095 & ~umask;
             mkfifo.call(this.o.fs, path, want);
             const made = (this.o.fs.lstat(path).mode ?? 0) & 4095;
@@ -4892,7 +4968,7 @@ var init_wasi_host = __esm({
             return E.SUCCESS;
           },
           umask: (mask, out) => {
-            const old = this.o.kernel.call({ op: "proc-umask", mask });
+            const old = this.umasks.set(mask);
             mem.view().setUint32(out, old, true);
           },
           fd_mode: (fd, out) => void mem.view().setUint32(out, fdMode(fd), true),
@@ -6181,7 +6257,7 @@ function importsContext({
     cwd: () => host.cwd,
     fs,
     fds,
-    syscall: call2,
+    syscall: (req) => req.op === "proc-umask" ? host.umask(req.mask) : call2(req),
     net: network(raw, call2),
     ...processes(host, call2, tid !== MAIN_TID),
     async: {
@@ -6325,7 +6401,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.125.5" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.125.8" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -8227,7 +8303,7 @@ function createNodeOps(h) {
         call2(() => bridge.mkdir(path, perm));
       } else if (Fs.isDir(mode)) {
         call2(() => bridge.mkdir(path));
-        const masked = mode & PERM_MASK & ~UMASK;
+        const masked = mode & PERM_MASK & ~UMASK2;
         if (masked !== DEFAULT_DIR_PERM) metadataCall(() => bridge.chmod(path, masked));
       } else if (Fs.isFile(mode)) {
         call2(
@@ -8917,7 +8993,7 @@ function readingLinks(Fs) {
     }
   };
 }
-var S_IFDIR, S_IFREG, S_IFLNK2, S_IFSOCK, S_IFIFO2, S_IFMT2, PERM_MASK, DEFAULT_DIR_PERM, UMASK, SEEK_CUR2, SEEK_END2, EARLY_WHOLE_FILE, O_APPEND4, O_ACCMODE, O_TRUNC, O_PATH, stale, opening, O_NOFOLLOW, RESOLVING;
+var S_IFDIR, S_IFREG, S_IFLNK2, S_IFSOCK, S_IFIFO2, S_IFMT2, PERM_MASK, DEFAULT_DIR_PERM, UMASK2, SEEK_CUR2, SEEK_END2, EARLY_WHOLE_FILE, O_APPEND4, O_ACCMODE, O_TRUNC, O_PATH, stale, opening, O_NOFOLLOW, RESOLVING;
 var init_live_vfs_fs = __esm({
   "src/realm/live-vfs-fs.ts"() {
     "use strict";
@@ -8935,7 +9011,7 @@ var init_live_vfs_fs = __esm({
     S_IFMT2 = 61440;
     PERM_MASK = 4095;
     DEFAULT_DIR_PERM = 493;
-    UMASK = 18;
+    UMASK2 = 18;
     SEEK_CUR2 = 1;
     SEEK_END2 = 2;
     EARLY_WHOLE_FILE = 64 * 1024;
@@ -12906,7 +12982,7 @@ var init_kernel_streams = __esm({
         };
       }
       ptsTarget(path, st) {
-        if ((st?.rdev ?? 0) >> 8 !== PTS_MAJOR) return void 0;
+        if ((st?.rdev ?? 0) < PTS_MAJOR << 8) return void 0;
         const { lookupPath } = this.Fs;
         const real = lookupPath?.call(this.Fs, path, { follow: true }).path;
         return real !== void 0 && isPtyPath(real) ? real : void 0;
@@ -14877,17 +14953,24 @@ var init_wasi_module = __esm({
 function ptsBridge(fs, call2) {
   const open = () => call2({ op: "pty-list" });
   const kernel = { json: (req) => call2(req) };
-  const entry = (p) => {
+  const entry = (p, known = open()) => {
     const n = PTS_ENTRY.exec(p)?.[1];
-    if (n === void 0 || !open().includes(Number(n))) throw syncError("ENOENT", p);
+    if (n === void 0 || !known.includes(Number(n))) throw syncError("ENOENT", p);
     return devSync(kernel, devStat(p, true));
   };
+  const listedEntry = (name2, known) => {
+    try {
+      return [name2, entry(`${PTS}/${name2}`, known)];
+    } catch {
+      return [name2, null];
+    }
+  };
   const dir = () => devSync(kernel, devStat(PTS, true));
   const statOf = (p, real) => {
     if (p === PTS) return dir();
     return PTS_ENTRY.test(p) ? entry(p) : real();
   };
-  const names = () => open().map(String).sort();
+  const names = (known = open()) => known.map(String).sort();
   const over = {
     stat: (p) => statOf(p, () => fs.stat(p)),
     lstat: (p) => statOf(p, () => fs.lstat(p)),
@@ -14902,7 +14985,10 @@ function ptsBridge(fs, call2) {
       return p === "/dev" && !listed.includes("pts") ? [...listed, "pts"] : listed;
     },
     readdirStat: (p) => {
-      if (p === PTS) return names().map((name2) => [name2, entry(`${PTS}/${name2}`)]);
+      if (p === PTS) {
+        const known = open();
+        return names(known).map((name2) => listedEntry(name2, known));
+      }
       const listed = fs.readdirStat(p);
       if (p !== "/dev" || listed.some(([name2]) => name2 === "pts")) return listed;
       return [...listed, ["pts", dir()]];
@@ -16716,6 +16802,7 @@ function wireSignals(host, gate) {
   host.interrupted = () => gate.interrupt();
   host.raisedOnEntry = () => gate.raisedOnEntry();
   host.quietly = (fn) => gate.quiet(fn);
+  host.deliverDue = () => void gate.interrupt();
   host.fds.restartable = () => gate.restartable();
 }
 function catchUpFirst(host, sync) {