@ai-ecoverse/slicc-kernel 1.119.0 → 1.119.2

package/dist/node-process-worker.js

@@ -1060,6 +1060,7 @@ var init_wasi_files = __esm({
     LocalFile = class {
       offset = 0;
       refs = 1;
+      ino;
       buffer;
       readable;
       writable;
@@ -1732,6 +1733,7 @@ function lockImports(host) {
     },
     fcntl_lock: (fd, cmd, at) => {
       if (cmd !== F_GETLK && cmd !== F_SETLK && cmd !== F_SETLKW) throw new WasiError("EINVAL");
+      host.promote(fd, true);
       const file = host.file(fd);
       const view = host.mem.view();
       const kind = kindOf(view.getInt16(at, true));
@@ -2245,9 +2247,9 @@ var init_wasi_fds = __esm({
         }
         this.bump();
       }
-      promote(fd) {
+      promote(fd, moved = false) {
         const e = this.get(fd);
-        if (e.type === "file") this.promoteFiles(e.file.buffer);
+        if (e.type === "file" && (!moved || this.moved(fd))) this.promoteFiles(e.file.buffer);
       }
       promoteFiles(only) {
         const promoted = /* @__PURE__ */ new Map();
@@ -2477,6 +2479,12 @@ var init_wasi_fds = __esm({
           throw err;
         }
       }
+      moved(fd) {
+        const e = this.get(fd);
+        if (e.type !== "file") return false;
+        if (e.file.buffer.isOrphan()) return true;
+        return e.file.ino !== void 0 && this.inoOf(e.file.path) !== e.file.ino;
+      }
       inoOf(path) {
         try {
           return this.fs.stat(path).ino;
@@ -2620,7 +2628,9 @@ var init_wasi_fds = __esm({
           buffer = this.freshBuffer(path, existing, oflags, want, mode);
         }
         buffer.opens++;
-        return new LocalFile(buffer, readable3, writable2, (fdflags & FDFLAGS.APPEND) !== 0);
+        const file = new LocalFile(buffer, readable3, writable2, (fdflags & FDFLAGS.APPEND) !== 0);
+        file.ino = existing?.ino;
+        return file;
       }
       freshBuffer(path, existing, oflags, want, mode) {
         const made = !existing && this.createNew(path, oflags, mode);
@@ -3993,7 +4003,7 @@ var init_wasi_host = __esm({
               else if (file.target.fd !== void 0) this.o.kernel.sys.flush(file.target.fd);
             },
             locked: () => this.fds.holdLocks(),
-            promote: (fd) => this.fds.promote(fd),
+            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 } : {} })
@@ -5385,7 +5395,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.119.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.119.2" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -8586,6 +8596,7 @@ function recordLock(fcntl, deps) {
     const Fs = deps.fs();
     const buffer = deps.memory();
     const stream = Fs?.getStream(fd);
+    if (stream && Fs && !stream.sliccKernelFile) lockPromoters.get(Fs)?.()(stream);
     const target = stream ? lockTarget(stream) : void 0;
     if (!Fs || !buffer || !stream || !target) return fcntl(fd, cmd, varargs);
     const view = new DataView(buffer);
@@ -8624,7 +8635,7 @@ function closeDropsLocks(Fs, kernel) {
     }
   };
 }
-var F_GETLK2, F_SETLK2, F_SETLKW2, F_RDLCK2, F_WRLCK2, F_UNLCK2, SEEK_CUR3, SEEK_END3, O_ACCMODE2, O_RDONLY, O_WRONLY4, held;
+var F_GETLK2, F_SETLK2, F_SETLKW2, F_RDLCK2, F_WRLCK2, F_UNLCK2, SEEK_CUR3, SEEK_END3, O_ACCMODE2, O_RDONLY, O_WRONLY4, lockPromoters, held;
 var init_process_locks = __esm({
   "src/process/process-locks.ts"() {
     "use strict";
@@ -8641,6 +8652,7 @@ var init_process_locks = __esm({
     O_ACCMODE2 = 3;
     O_RDONLY = 0;
     O_WRONLY4 = 1;
+    lockPromoters = /* @__PURE__ */ new WeakMap();
     held = /* @__PURE__ */ new WeakMap();
   }
 });
@@ -12928,6 +12940,7 @@ function anySelect(Fs, transport, read2, write2, timeoutMs2) {
 }
 function createProcessKernel(deps) {
   const { transport, Fs } = deps;
+  if (deps.stdioPromoter) lockPromoters.set(Fs, deps.stdioPromoter);
   const reaped = /* @__PURE__ */ new Map();
   const call2 = (req, label) => transport.call(req, Infinity, label);
   const at = (path) => path === "" || path.startsWith("/") ? path : `${Fs.cwd()}/${path}`;
@@ -13090,6 +13103,7 @@ var init_process_children = __esm({
     "use strict";
     init_signals();
     init_process_fork();
+    init_process_locks();
     init_wasi_errno();
     S_IFMT3 = 61440;
     S_IFDIR2 = 16384;