@ai-ecoverse/slicc-kernel 1.120.0 → 1.120.2

package/dist/process-worker.js

@@ -702,7 +702,11 @@ var init_ranged = __esm({
         if (!watch || this.pinned) return;
         const { now, changed: changed2 } = watchedChange(watch, this.seen, this.path);
         this.seen = now;
-        if (!changed2) return;
+        if (changed2) this.reread();
+      }
+      reread() {
+        const watch = this.watch;
+        if (!watch || this.pinned || this.pages.changed) return;
         let st;
         try {
           st = watch.stat(this.path);
@@ -1028,7 +1032,7 @@ function normal(path) {
   }
   return `/${parts.join("/")}`;
 }
-var GEN, RING, RING_SIZE, SLOT, DIRTY, CHANGES_BYTES, ChangeView;
+var GEN, RING, RING_SIZE, SLOT, DIRTY, FOREIGN, CHANGES_BYTES, ChangeView;
 var init_changes = __esm({
   "src/fs/changes.ts"() {
     "use strict";
@@ -1037,7 +1041,8 @@ var init_changes = __esm({
     RING_SIZE = 4096;
     SLOT = 2;
     DIRTY = RING + RING_SIZE * SLOT;
-    CHANGES_BYTES = (DIRTY + 1) * 4;
+    FOREIGN = DIRTY + 1;
+    CHANGES_BYTES = (FOREIGN + 1) * 4;
     ChangeView = class {
       view;
       constructor(sab) {
@@ -1049,6 +1054,9 @@ var init_changes = __esm({
       clean() {
         return this.view.length > DIRTY && Atomics.load(this.view, DIRTY) === 0;
       }
+      foreign() {
+        return this.view.length > FOREIGN && Atomics.load(this.view, FOREIGN) === 1;
+      }
       changedSince(seen, path) {
         const now = Atomics.load(this.view, GEN);
         const distance = now - seen >>> 0;
@@ -1409,7 +1417,8 @@ function refusal(err) {
   const code2 = err?.code;
   return code2 === "EACCES" || code2 === "EPERM";
 }
-function cachedStat(s, dir) {
+function cachedStat(s, dir, view) {
+  if (view?.foreign() && !s.dirty) return false;
   return s.stat !== void 0 && (!dir || s.statAt === syncCallCount());
 }
 function searchParents(Fs, node, bridge, call2) {
@@ -1530,7 +1539,7 @@ function createHelpers(Fs, ops) {
       const size = node.live.ranged?.size() ?? node.live.len;
       return { ...node.live.stat, size };
     }
-    if (!cachedStat(node.live, Fs.isDir(node.mode))) {
+    if (!cachedStat(node.live, Fs.isDir(node.mode), bridgeOf(node).changes)) {
       const st = call2(() => bridgeOf(node).lstat(liveNodePath(linked.holder(node))));
       Object.assign(node.live, { stat: st, statAt: syncCallCount() });
       node.mode = modeFromStat(st, exactIn(node));
@@ -1694,7 +1703,7 @@ function createNodeOps(h) {
       const owned = bridgeOf(node).owners === true;
       if (owned && Fs.isLink(node.mode) && statOf(node).uid === void 0)
         node.live.stat = void 0;
-      const cached = owned && cachedStat(node.live, Fs.isDir(node.mode));
+      const cached = owned && cachedStat(node.live, Fs.isDir(node.mode), bridgeOf(node).changes);
       const st = statOf(node);
       if (cached) searchParents(Fs, node, bridgeOf(node), call2);
       const s = node.live;
@@ -2256,6 +2265,8 @@ function guardKeptNodes(Fs, handled) {
 }
 function outdated(node, view, before) {
   const s = node.live;
+  if (view.foreign() && s.openCount === 0 && !s.dirty && node !== node.mount.root && !node.mounted)
+    return true;
   if (s.named === void 0) {
     s.named = before;
     return false;
@@ -2542,7 +2553,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.120.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.120.2" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -6412,7 +6423,7 @@ function cachingBridge(bridge, now = () => performance.now(), shared) {
     return void 0;
   };
   const cached = (map, path, get) => {
-    if (blind) return get();
+    if (blind || view?.foreign()) return get();
     cache.fresh();
     let hit = map.get(path);
     if (hit === void 0 || "until" in hit && !live(hit, path)) {
@@ -6701,6 +6712,11 @@ var init_wasi_files = __esm({
         this.orphaned = true;
         this.ranged?.pin();
       }
+      reread() {
+        if (this.dirty || this.orphaned) return;
+        if (this.ranged) this.ranged.reread();
+        else this.data = void 0;
+      }
       isOrphan() {
         return this.orphaned;
       }
@@ -6943,7 +6959,8 @@ function lockImports(host) {
       host.promote(fd);
       const kind = FLOCK_OPS[op & ~LOCK_NB];
       if (!kind) throw new WasiError("EINVAL");
-      host.calls.flock(fd, kind, kind !== "unlock" && (op & LOCK_NB) === 0);
+      const shared = host.calls.flock(fd, kind, kind !== "unlock" && (op & LOCK_NB) === 0);
+      if (kind !== "unlock" && shared === true) host.reread(fd);
     },
     fcntl_lock: (fd, cmd, at) => {
       if (cmd !== F_GETLK2 && cmd !== F_SETLK2 && cmd !== F_SETLKW2) throw new WasiError("EINVAL");
@@ -6961,8 +6978,10 @@ function lockImports(host) {
       if (kind === "read" && file.readable === false || kind === "write" && file.writable === false)
         throw new WasiError("EBADF");
       if (kind !== "write") host.flush(file);
-      host.calls.set(file.target, kind, start2, len, cmd === F_SETLKW2);
-      if (kind !== "unlock") host.locked();
+      const shared = host.calls.set(file.target, kind, start2, len, cmd === F_SETLKW2);
+      if (kind === "unlock") return;
+      host.locked();
+      if (shared === true) host.reread(fd);
     }
   };
 }
@@ -7664,6 +7683,10 @@ var init_wasi_fds = __esm({
           }
         }
       }
+      reread(fd) {
+        const e = this.get(fd);
+        if (e.type === "file") e.file.buffer.reread();
+      }
       flushPath(path) {
         for (const [p, buffer] of this.buffers) if (within(p, path)) buffer.flush();
         if (this.shared && !this.fs.changes?.clean()) this.kernel.call({ op: "fd-path-flush", path });
@@ -9146,6 +9169,35 @@ var init_wasi_host = __esm({
           }
         });
       }
+      lockHost(mem) {
+        return {
+          mem,
+          file: (fd) => this.lockedFile(fd),
+          flush: (file) => {
+            if (file.path !== void 0) this.fds.flushPath(file.path);
+            else if (file.target.fd !== void 0) this.o.kernel.sys.flush(file.target.fd);
+          },
+          locked: () => this.fds.holdLocks(),
+          promote: (fd, moved) => this.fds.promote(fd, moved),
+          reread: (fd) => this.fds.reread(fd),
+          calls: {
+            flock: (fd, kind, wait2) => this.fds.restarting(
+              () => this.o.kernel.call({ op: "flock", fd, kind, ...wait2 ? { wait: wait2 } : {} })
+            ),
+            set: (target, kind, start2, len, wait2) => this.fds.restarting(
+              () => this.o.kernel.call({
+                op: "lk-set",
+                ...target,
+                kind,
+                start: start2,
+                len,
+                ...wait2 ? { wait: wait2 } : {}
+              })
+            ),
+            get: (target, kind, start2, len) => this.o.kernel.call({ op: "lk-get", ...target, kind, start: start2, len })
+          }
+        };
+      }
       sliccImports() {
         const { mem } = this;
         const path = (p, l) => {
@@ -9176,32 +9228,7 @@ var init_wasi_host = __esm({
             void this.creds.change(() => this.o.kernel.call({ op: "proc-setcred", change }));
           },
           ...semImports(this),
-          ...lockImports({
-            mem,
-            file: (fd) => this.lockedFile(fd),
-            flush: (file) => {
-              if (file.path !== void 0) this.fds.flushPath(file.path);
-              else if (file.target.fd !== void 0) this.o.kernel.sys.flush(file.target.fd);
-            },
-            locked: () => this.fds.holdLocks(),
-            promote: (fd, moved) => this.fds.promote(fd, moved),
-            calls: {
-              flock: (fd, kind, wait2) => void this.fds.restarting(
-                () => this.o.kernel.call({ op: "flock", fd, kind, ...wait2 ? { wait: wait2 } : {} })
-              ),
-              set: (target, kind, start2, len, wait2) => void this.fds.restarting(
-                () => this.o.kernel.call({
-                  op: "lk-set",
-                  ...target,
-                  kind,
-                  start: start2,
-                  len,
-                  ...wait2 ? { wait: wait2 } : {}
-                })
-              ),
-              get: (target, kind, start2, len) => this.o.kernel.call({ op: "lk-get", ...target, kind, start: start2, len })
-            }
-          }),
+          ...lockImports(this.lockHost(mem)),
           groups_get: (buf, cap, count) => {
             const { groups } = this.creds.get();
             if (cap !== 0 && cap < groups.length) throw new WasiError("EINVAL");