@ai-ecoverse/slicc-kernel 1.29.0 → 1.29.2

package/dist/process-worker.js

@@ -694,6 +694,22 @@ function createHelpers(Fs, ops) {
 function createNodeOps(h) {
   const { Fs, bridgeOf, call: call2, metadataCall, makeNode, statOf, childPath, flushNode, truncate } = h;
   const { ensureLoaded } = h;
+  const setTimes = (node, path, atime, mtime) => {
+    if (Fs.isLink(node.mode)) {
+      metadataCall(() => bridgeOf(node).lutimes(path, atime, mtime));
+      return;
+    }
+    flushNode(node);
+    metadataCall(() => bridgeOf(node).utimes(path, atime, mtime));
+  };
+  const timesOf = (node, attr2) => {
+    const mtime = toMs(attr2.mtime) ?? attr2.timestamp;
+    const atime = toMs(attr2.atime);
+    if (mtime !== void 0 && attr2.atime !== null) return [atime ?? mtime, mtime];
+    if (atime === void 0 && mtime === void 0) return void 0;
+    const st = statOf(node);
+    return [atime ?? st.atimeMs ?? st.mtimeMs ?? 0, mtime ?? st.mtimeMs ?? 0];
+  };
   return {
     getattr(node) {
       const st = statOf(node);
@@ -735,12 +751,8 @@ function createNodeOps(h) {
       if (attr2.size !== void 0 && attr2.size !== null && Fs.isFile(node.mode)) {
         truncate(node, attr2.size);
       }
-      const mtime = toMs(attr2.mtime) ?? attr2.timestamp;
-      if (mtime !== void 0) {
-        const atime = toMs(attr2.atime) ?? mtime;
-        flushNode(node);
-        metadataCall(() => bridgeOf(node).utimes(path, atime, mtime));
-      }
+      const times = timesOf(node, attr2);
+      if (times) setTimes(node, path, ...times);
       node.live.stat = void 0;
     },
     lookup(parent, name) {
@@ -1451,6 +1463,9 @@ function createSyncFsSabBridge(transport, opts = {}) {
     utimes: (path, atimeMs, mtimeMs) => {
       run({ op: "utimes", path, atimeMs, mtimeMs }, path);
     },
+    lutimes: (path, atimeMs, mtimeMs) => {
+      run({ op: "lutimes", path, atimeMs, mtimeMs }, path);
+    },
     hold: (path, held) => {
       run({ op: "hold", path, mode: held ? 1 : 0 }, path);
     },
@@ -2267,6 +2282,32 @@ function wrapCloexecSyscalls(imports, glue, deps) {
     }
   }
 }
+function noFollowUtimes(imports, fs, glue) {
+  for (const namespace of namespaces(imports)) {
+    const key = Object.keys(namespace).find(
+      (name) => glue !== void 0 && namespace[name] === glue || name === "__syscall_utimensat"
+    );
+    const utimensat = key === void 0 ? void 0 : namespace[key];
+    if (key === void 0 || typeof utimensat !== "function") continue;
+    namespace[key] = (dirfd, path, times, flags) => {
+      const Fs = fs();
+      const { utime, lookupPath, ErrnoError } = Fs ?? {};
+      if (!Fs || !(flags & AT_SYMLINK_NOFOLLOW) || !utime || !lookupPath || !ErrnoError) {
+        return utimensat(dirfd, path, times, flags);
+      }
+      Fs.utime = (at, atime, mtime) => {
+        const { node } = lookupPath.call(Fs, at, { follow: false });
+        if (!node.node_ops.setattr) throw new ErrnoError(EMSCRIPTEN_EPERM);
+        node.node_ops.setattr(node, { atime, mtime });
+      };
+      try {
+        return utimensat(dirfd, path, times, flags);
+      } finally {
+        Fs.utime = utime;
+      }
+    };
+  }
+}
 function errnoOf(err) {
   const { errno: errno2, code: code2 } = err ?? {};
   if (typeof errno2 === "number") return errno2;
@@ -2515,7 +2556,7 @@ function useMounts(Fs, env = {}, live = false) {
     }
   };
 }
-var O_CLOEXEC, FD_CLOEXEC, F_DUPFD, F_GETFD, F_SETFD, F_GETFL, F_DUPFD_CLOEXEC, tracked, IMPORT_NAMES, EBADF, DIR_MODE, LINK_MODE, O_ACCMODE, O_CREAT2, field, NAME;
+var O_CLOEXEC, FD_CLOEXEC, F_DUPFD, F_GETFD, F_SETFD, F_GETFL, F_DUPFD_CLOEXEC, tracked, IMPORT_NAMES, EBADF, AT_SYMLINK_NOFOLLOW, EMSCRIPTEN_EPERM, DIR_MODE, LINK_MODE, O_ACCMODE, O_CREAT2, field, NAME;
 var init_process_fds = __esm({
   "src/process/process-fds.ts"() {
     "use strict";
@@ -2540,6 +2581,8 @@ var init_process_fds = __esm({
       setitimer: "_setitimer_js"
     };
     EBADF = 8;
+    AT_SYMLINK_NOFOLLOW = 256;
+    EMSCRIPTEN_EPERM = 63;
     DIR_MODE = 16749;
     LINK_MODE = 41408;
     O_ACCMODE = 3;
@@ -3476,6 +3519,15 @@ function ownValue(module, name) {
   const own = Object.getOwnPropertyDescriptor(module, name);
   return own && "value" in own ? own.value : void 0;
 }
+function identify(transport, init) {
+  const r = transport.call({ op: "proc-identity" }, Number.POSITIVE_INFINITY, "proc-identity");
+  const id = r.ok && r.kind === "json" ? r.json : null;
+  return id ?? { pid: init.pid, ppid: init.ppid ?? 1 };
+}
+function liveParent(imports, parent) {
+  const env = imports.env;
+  if (env && typeof env.slicc_getppid_js === "function") env.slicc_getppid_js = parent;
+}
 function signalMasks(m) {
   const mask = m.sliccSigMask;
   const caught = mask?.(0) ?? -1;
@@ -3519,11 +3571,12 @@ async function runWasmProcess(init, port, deps = {}) {
     ready = resolve;
     failed2 = reject;
   });
+  const id = identify(transport, init);
   const module = {
     noInitialRun: true,
     thisProgram: init.argv0,
-    sliccPid: init.pid,
-    ...init.ppid !== void 0 ? { sliccPpid: init.ppid } : {},
+    sliccPid: id.pid,
+    sliccPpid: id.ppid,
     sliccEnv: init.env,
     print: say(1),
     printErr: say(2),
@@ -3543,6 +3596,12 @@ async function runWasmProcess(init, port, deps = {}) {
             }
           }
         });
+        liveParent(imports, () => identify(transport, init).ppid);
+        noFollowUtimes(
+          imports,
+          () => ownValue(module, "FS"),
+          ownValue(module, "sliccSyscalls")?.utimensat
+        );
         const glue = ownValue(module, "sliccFdImports");
         syncFsync(imports, () => ownValue(module, "FS"), glue);
         positionalIo(imports, {
@@ -3891,6 +3950,7 @@ function cachingBridge(bridge, now = () => performance.now()) {
     symlink: (target, link) => mutating(() => bridge.symlink(target, link)),
     chmod: (p, mode) => mutating(() => bridge.chmod(p, mode)),
     utimes: (p, a, m) => mutating(() => bridge.utimes(p, a, m)),
+    lutimes: (p, a, m) => mutating(() => bridge.lutimes(p, a, m)),
     ...bridge.pread && bridge.pwrite && bridge.truncate ? {
       pread: bridge.pread.bind(bridge),
       pwrite: (p, at, bytes, transfer) => mutating(() => bridge.pwrite?.(p, at, bytes, transfer)),
@@ -5023,10 +5083,10 @@ var init_wasi_host = __esm({
         return {
           path_open: (dirfd, _lookup, p, l, oflags, rights, _inheriting, fdflags, out) => void mem.view().setUint32(out, fds.open(at(dirfd, p, l), oflags, rights, fdflags), true),
           path_filestat_get: (dirfd, lookup, p, l, out) => void this.writeFilestat(out, this.pathFilestat(at(dirfd, p, l), lookup)),
-          path_filestat_set_times: (dirfd, _lookup, p, l, atim, mtim, flags) => {
+          path_filestat_set_times: (dirfd, lookup, p, l, atim, mtim, flags) => {
             const path = at(dirfd, p, l);
             fds.flushPath(path);
-            this.setTimes(path, atim, mtim, flags);
+            this.setTimes(path, atim, mtim, flags, (lookup & LOOKUP_SYMLINK_FOLLOW) !== 0);
           },
           path_create_directory: (dirfd, p, l) => {
             const path = at(dirfd, p, l);
@@ -5259,15 +5319,20 @@ var init_wasi_host = __esm({
         const follow = (lookup & LOOKUP_SYMLINK_FOLLOW) !== 0;
         return filestatOf(path, follow ? this.o.fs.stat(path) : this.o.fs.lstat(path));
       }
-      setTimes(path, atim, mtim, flags) {
+      setTimes(path, atim, mtim, flags, follow = true) {
         const now = Date.now();
         let current;
-        const kept = () => current ??= this.o.fs.stat(path).mtimeMs ?? now;
-        const pick = (set, setNow, value2) => flags & setNow ? now : flags & set ? Number(value2 / NS_PER_MS) : kept();
-        this.o.fs.utimes(
+        const statOf = follow ? this.o.fs.stat.bind(this.o.fs) : this.o.fs.lstat.bind(this.o.fs);
+        const kept = (field2) => {
+          current ??= statOf(path);
+          return current[field2] ?? current.mtimeMs ?? now;
+        };
+        const pick = (set, setNow, value2, field2) => flags & setNow ? now : flags & set ? Number(value2 / NS_PER_MS) : kept(field2);
+        (follow ? this.o.fs.utimes : this.o.fs.lutimes).call(
+          this.o.fs,
           path,
-          pick(FSTFLAGS.ATIM, FSTFLAGS.ATIM_NOW, atim),
-          pick(FSTFLAGS.MTIM, FSTFLAGS.MTIM_NOW, mtim)
+          pick(FSTFLAGS.ATIM, FSTFLAGS.ATIM_NOW, atim, "atimeMs"),
+          pick(FSTFLAGS.MTIM, FSTFLAGS.MTIM_NOW, mtim, "mtimeMs")
         );
       }
       readdir(fd, buf, len, cookie, usedPtr) {
@@ -6750,7 +6815,7 @@ var init_wasix_host = __esm({
           proc_id: (out) => void mem.view().setUint32(out, host.o.pid, true),
           proc_parent: (pid, out) => {
             if (pid !== 0 && pid !== host.o.pid) throw new WasiError("ESRCH");
-            mem.view().setUint32(out, host.o.ppid ?? 1, true);
+            mem.view().setUint32(out, host.o.parent?.() ?? host.o.ppid ?? 1, true);
           },
           getcwd: (buf, lenPtr) => {
             const bytes = new TextEncoder().encode(host.cwd);
@@ -7286,6 +7351,7 @@ async function runWasiProcess(init, port) {
   });
   const main = {};
   const { transport, sys, call: kernelCall, say } = kernelOf(init, port, signals, sizeOf(main));
+  const id = identify(transport, init);
   const stats = init.env.SLICC_WASI_STATS === "1" ? new WasiStats() : void 0;
   const call2 = stats ? timedCalls(stats, kernelCall) : kernelCall;
   const { module } = init.program;
@@ -7306,8 +7372,9 @@ async function runWasiProcess(init, port) {
     args: [init.argv0, ...init.args],
     env: init.env,
     cwd: fork?.cwd ?? init.cwd,
-    pid: init.pid,
-    ...init.ppid !== void 0 ? { ppid: init.ppid } : {},
+    pid: id.pid,
+    ppid: id.ppid,
+    parent: () => identify(transport, init).ppid,
     kernel: { sys: traced(stats, "kernel", sys), call: call2 },
     fs: cachingBridge(traced(stats, "fs", createSyncFsSabBridge(transport))),
     ...fork?.shared && threads ? { shared: threads.ids } : fork ? { forked: { fds: fork.fds, cloexec: fork.cloexec } } : { inherited: init.fds }
@@ -7381,12 +7448,14 @@ async function runWasiThread(init, port) {
   const { thread } = init;
   const threads = new WasiThreads(port, thread.memory, threadCap(init.env), thread.tid, thread.ids);
   threads.received = thread.modules;
+  const id = identify(transport, init);
   const host = new WasiHost({
     args: [init.argv0, ...init.args],
     env: init.env,
     cwd: init.cwd,
-    pid: init.pid,
-    ...init.ppid !== void 0 ? { ppid: init.ppid } : {},
+    pid: id.pid,
+    ppid: id.ppid,
+    parent: () => identify(transport, init).ppid,
     kernel: { sys, call: call2 },
     fs: cachingBridge(createSyncFsSabBridge(transport)),
     shared: threads.ids