@ai-ecoverse/slicc-kernel 1.29.1 → 1.30.0

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;
@@ -3554,6 +3597,11 @@ 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, {
@@ -3902,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)),
@@ -4107,18 +4156,20 @@ function kernelEntry2() {
 function deviceEntry(meta) {
   return { type: "device", device: meta.device, ...meta.access ? { access: meta.access } : {} };
 }
+function preopenOf(e) {
+  return {
+    ...e.preopen ? { preopen: e.preopen } : {},
+    ...e.twin !== void 0 ? { twin: e.twin } : {}
+  };
+}
 function metaOf(e) {
-  if (e.type === "dir") return { dir: e.path, ...e.preopen ? { preopen: e.preopen } : {} };
+  if (e.type === "dir") return { dir: e.path, ...preopenOf(e) };
   if (e.type === "device") return { device: e.device, ...e.access ? { access: e.access } : {} };
   return void 0;
 }
 function entryOf(info) {
   if (info.meta && "dir" in info.meta) {
-    return {
-      type: "dir",
-      path: info.meta.dir,
-      ...info.meta.preopen ? { preopen: info.meta.preopen } : {}
-    };
+    return { type: "dir", path: info.meta.dir, ...preopenOf(info.meta) };
   }
   if (info.meta && "device" in info.meta) return deviceEntry(info.meta);
   if (info.kind === "held") return void 0;
@@ -4178,9 +4229,9 @@ var init_wasi_fds = __esm({
         this.kernel = kernel;
         this.fs = fs;
       }
-      setup(cwd, inherited) {
+      setup(cwd, inherited, root = false) {
         for (const fd of [0, 1, 2]) this.table.set(fd, kernelEntry2());
-        const preopens = this.preopens(cwd);
+        const preopens = this.preopens(cwd, root);
         const top = 3 + preopens.length;
         for (const { fd, kind, flags, device } of inherited) {
           let at = fd;
@@ -4200,8 +4251,10 @@ var init_wasi_fds = __esm({
           this.table.set(3 + i, entry);
         });
       }
-      preopens(cwd) {
-        const out = [{ type: "dir", path: normalize(cwd), preopen: "." }];
+      preopens(cwd, root) {
+        const here = normalize(cwd);
+        const dot = { type: "dir", path: here, preopen: "." };
+        const out = [dot];
         let names = [];
         try {
           names = this.fs.readdir("/");
@@ -4219,6 +4272,13 @@ var init_wasi_fds = __esm({
           } catch {
           }
         }
+        if (root) {
+          out.push(
+            { type: "dir", path: "/", preopen: "/" },
+            { type: "dir", path: here, preopen: "./" }
+          );
+          dot.twin = 3 + out.length - 1;
+        }
         return out;
       }
       find(fd) {
@@ -4370,8 +4430,13 @@ var init_wasi_fds = __esm({
       chdir(path) {
         const dot = this.find(3);
         if (dot?.type !== "dir" || dot.preopen !== ".") return;
-        dot.path = path;
-        this.kernel.call({ op: "fd-meta", fd: 3, meta: { dir: path, preopen: "." } });
+        const moved = [[3, dot]];
+        const twin = dot.twin === void 0 ? void 0 : this.find(dot.twin);
+        if (twin?.type === "dir" && twin.preopen === "./") moved.push([dot.twin, twin]);
+        for (const [fd, e] of moved) {
+          e.path = path;
+          this.kernel.call({ op: "fd-meta", fd, meta: metaOf(e) });
+        }
         this.bump();
       }
       promoteFiles() {
@@ -4399,8 +4464,7 @@ var init_wasi_fds = __esm({
         for (const [fd, e] of this.table) {
           if (e.type === "kernel")
             out.push({ fd, type: "kernel", nonblock: e.nonblock, append: e.append });
-          else if (e.type === "dir")
-            out.push({ fd, type: "dir", path: e.path, ...e.preopen ? { preopen: e.preopen } : {} });
+          else if (e.type === "dir") out.push({ fd, type: "dir", path: e.path, ...preopenOf(e) });
           else if (e.type === "device") out.push({ fd, ...deviceEntry(e) });
         }
         return out;
@@ -4411,11 +4475,7 @@ var init_wasi_fds = __esm({
           if (f.type === "kernel")
             this.table.set(f.fd, { type: "kernel", nonblock: f.nonblock, append: f.append });
           else if (f.type === "dir")
-            this.table.set(f.fd, {
-              type: "dir",
-              path: f.path,
-              ...f.preopen ? { preopen: f.preopen } : {}
-            });
+            this.table.set(f.fd, { type: "dir", path: f.path, ...preopenOf(f) });
           else this.table.set(f.fd, deviceEntry(f));
         }
         for (const fd of cloexec) this.cloexec.add(fd);
@@ -4877,7 +4937,7 @@ var init_wasi_host = __esm({
         this.fds = new WasiFds(o.kernel, o.fs);
         if (o.shared) this.fds.share(o.shared, true);
         else if (o.forked) this.fds.restore(o.forked.fds, o.forked.cloexec);
-        else this.fds.setup(o.cwd, o.inherited ?? []);
+        else this.fds.setup(o.cwd, o.inherited ?? [], o.preopenRoot === true);
         this.listening = o.shared ? [] : this.fds.sockets();
       }
       get cwd() {
@@ -5034,10 +5094,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);
@@ -5270,15 +5330,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) {
@@ -7289,6 +7354,11 @@ function merge(base, extra) {
   for (const [ns, values] of Object.entries(extra)) out[ns] = { ...base[ns], ...values };
   return out;
 }
+function descriptors(init, fork, threads) {
+  if (fork?.shared && threads) return { shared: threads.ids };
+  if (fork) return { forked: { fds: fork.fds, cloexec: fork.cloexec } };
+  return { inherited: init.fds ?? [], ...init.program.preopenRoot ? { preopenRoot: true } : {} };
+}
 async function runWasiProcess(init, port) {
   captureBacktraces(init.env);
   const signals = new WasiSignals((sig) => {
@@ -7323,7 +7393,7 @@ async function runWasiProcess(init, port) {
     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 }
+    ...descriptors(init, fork, threads)
   });
   if (threads) {
     threads.beforeSpawn = () => {