@ai-ecoverse/slicc-kernel 1.120.0 → 1.120.1

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);
@@ -2542,7 +2546,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.1" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -6701,6 +6705,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 +6952,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 +6971,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 +7676,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 +9162,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 +9221,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");