@ai-ecoverse/slicc-kernel 1.121.1 → 1.122.0

package/dist/process-worker.js

@@ -2553,7 +2553,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.121.1" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.122.0" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -2650,7 +2650,24 @@ function closeDropsLocks(Fs, kernel) {
     }
   };
 }
-var F_GETLK, F_SETLK, F_SETLKW, F_RDLCK, F_WRLCK, F_UNLCK, SEEK_CUR2, SEEK_END2, O_ACCMODE2, O_RDONLY, O_WRONLY, lockPromoters, held;
+function kernelFlock(deps) {
+  return (fd, op) => {
+    const kind = FLOCK_KINDS[op & ~LOCK_NB];
+    if (!kind) return -wasiErrno("EINVAL");
+    const Fs = deps.fs();
+    const stream = Fs?.getStream(fd);
+    if (!Fs || !stream) return -wasiErrno("EBADF");
+    if (stream.sliccKernelFd === void 0) lockPromoters.get(Fs)?.()(stream);
+    if (stream.sliccKernelFd === void 0) return 0;
+    try {
+      deps.flock(stream.sliccKernelFd, kind, kind !== "unlock" && (op & LOCK_NB) === 0);
+      return 0;
+    } catch (err) {
+      return -errnoOf(err);
+    }
+  };
+}
+var F_GETLK, F_SETLK, F_SETLKW, F_RDLCK, F_WRLCK, F_UNLCK, SEEK_CUR2, SEEK_END2, O_ACCMODE2, O_RDONLY, O_WRONLY, lockPromoters, held, LOCK_NB, FLOCK_KINDS;
 var init_process_locks = __esm({
   "src/process/process-locks.ts"() {
     "use strict";
@@ -2669,6 +2686,12 @@ var init_process_locks = __esm({
     O_WRONLY = 1;
     lockPromoters = /* @__PURE__ */ new WeakMap();
     held = /* @__PURE__ */ new WeakMap();
+    LOCK_NB = 4;
+    FLOCK_KINDS = {
+      1: "shared",
+      2: "exclusive",
+      8: "unlock"
+    };
   }
 });
 
@@ -3568,7 +3591,8 @@ var init_process_fds = __esm({
       resizeHeap: "emscripten_resize_heap",
       fdWrite: "fd_write",
       fdRead: "fd_read",
-      sleepMs: "slicc_sleep_ms"
+      sleepMs: "slicc_sleep_ms",
+      flock: "__syscall_flock"
     };
     UTIME_NOW = 1073741823;
     UTIME_OMIT = 1073741822;
@@ -5692,6 +5716,9 @@ function kernelSys(transport) {
     closeLocks(target) {
       call2({ op: "lk-close", ...target }, "lk-close");
     },
+    flock(fd, kind, wait2) {
+      call2({ op: "flock", fd, kind, ...wait2 ? { wait: wait2 } : {} }, `flock ${fd}`);
+    },
     ptyNumber(fd) {
       return json2(call2({ op: "pty-number", fd }, `pty-number ${fd}`));
     },
@@ -5825,6 +5852,13 @@ function kernelWrappers(imports, module, deps) {
   kernelLink(imports, fsOf, memory, kernelGlue);
   devCreations(imports, fsOf, memory, kernelGlue);
   kernelUname(imports, hostnameOf(init.env), memory, kernelGlue);
+  wrapImport(
+    imports,
+    "flock",
+    kernelGlue,
+    () => kernelFlock({ fs: fsOf, flock: (fd, kind, wait2) => sys.flock?.(fd, kind, wait2) }),
+    true
+  );
   const glue = ownValue(module, "sliccFdImports");
   syncFsync(imports, fsOf, glue);
   positionalIo(imports, { glue, fs: fsOf, sys, memory });
@@ -6158,6 +6192,7 @@ var init_process_runtime = __esm({
       "  fdWrite: typeof _fd_write === 'function' ? _fd_write : undefined,",
       "  fdRead: typeof _fd_read === 'function' ? _fd_read : undefined,",
       "  sleepMs: typeof slicc_sleep_ms === 'function' ? slicc_sleep_ms : undefined,",
+      "  flock: typeof __syscall_flock === 'function' ? __syscall_flock : undefined,",
       "};",
       "Module.sliccFdImports ??= {",
       "  fd_sync: typeof _fd_sync === 'function' ? _fd_sync : undefined,",
@@ -6966,9 +7001,9 @@ function lockImports(host) {
   return {
     flock: (fd, op) => {
       host.promote(fd);
-      const kind = FLOCK_OPS[op & ~LOCK_NB];
+      const kind = FLOCK_OPS[op & ~LOCK_NB2];
       if (!kind) throw new WasiError("EINVAL");
-      const shared = host.calls.flock(fd, kind, kind !== "unlock" && (op & LOCK_NB) === 0);
+      const shared = host.calls.flock(fd, kind, kind !== "unlock" && (op & LOCK_NB2) === 0);
       if (kind !== "unlock" && shared === true) host.reread(fd);
     },
     fcntl_lock: (fd, cmd, at) => {
@@ -6994,7 +7029,7 @@ function lockImports(host) {
     }
   };
 }
-var F_GETLK2, F_SETLK2, F_SETLKW2, F_RDLCK2, F_WRLCK2, F_UNLCK2, SEEK_SET, SEEK_CUR3, SEEK_END3, LOCK_NB, FLOCK_OPS;
+var F_GETLK2, F_SETLK2, F_SETLKW2, F_RDLCK2, F_WRLCK2, F_UNLCK2, SEEK_SET, SEEK_CUR3, SEEK_END3, LOCK_NB2, FLOCK_OPS;
 var init_slicc_lock = __esm({
   "src/process/wasi/slicc-lock.ts"() {
     "use strict";
@@ -7008,7 +7043,7 @@ var init_slicc_lock = __esm({
     SEEK_SET = 0;
     SEEK_CUR3 = 1;
     SEEK_END3 = 2;
-    LOCK_NB = 4;
+    LOCK_NB2 = 4;
     FLOCK_OPS = { 1: "shared", 2: "exclusive", 8: "unlock" };
   }
 });