@ai-ecoverse/slicc-kernel 1.26.4 → 1.26.6

package/README.md

@@ -300,14 +300,14 @@ Programs mount and unmount with `mount(2)` and `umount2(2)`, so a `mount`/`umoun
 
 ### Exec
 
-An exec'd program takes over the pid of the process it replaces, as on Linux: `getpid()` and `$$` in the new image, `/proc`, `ps`, `kill` and the parent's `waitpid` all agree on that pid, and the image's parent pid is the replaced process's. Its own children see that pid as their parent. Signals a program ignores stay ignored in the image it execs and in the children it spawns or forks, as POSIX has it, so `nohup cmd` and `trap '' TERM; exec cmd` keep `cmd` safe from them; caught signals go back to their default. The kernel holds what was handed down, so a new image that sets one of those signals back to the default with `signal(SIG_DFL)` still ignores it, until it installs a handler.
+An exec'd program takes over the pid of the process it replaces, as on Linux: `getpid()` and `$$` in the new image, `/proc`, `ps`, `kill` and the parent's `waitpid` all agree on that pid, and the image's parent pid is the replaced process's. Its own children see that pid as their parent. A file removed or renamed over while programs hold it open keeps its bytes for them, as on Linux: the kernel keeps one copy for all holders, shared by their descriptors (writes through one are seen through the others), and frees it when the last one closes. Signals a program ignores stay ignored in the image it execs and in the children it spawns or forks, as POSIX has it, so `nohup cmd` and `trap '' TERM; exec cmd` keep `cmd` safe from them; caught signals go back to their default. The kernel holds what was handed down, so a new image that sets one of those signals back to the default with `signal(SIG_DFL)` still ignores it, until it installs a handler.
 
 - **Emscripten:** `Module.sliccKernel.execve(file, argv, env, cwd)` runs `file` as this process's new image on its fds 0, 1 and 2, waits for it, and returns its wait status, or a negative errno when it cannot start. `env` and `cwd` may be `null` for this process's own. An exec shim detects it with `typeof Module.sliccKernel.execve === 'function'` and exits with the status it returns, as `execve` never returns on success. Older shims spawn the program and then call `Module.sliccKernel.execWait(pid)`; that still works, but the image then reports a pid of its own from `getpid()`.
 - **WASIX:** `proc_exec` does this by itself.
 
 ### `/proc`
 
-Every process of the kernel has `/proc/<pid>/` with `cmdline`, `comm`, `stat`, `statm` and `status`, in the formats procps reads, and `/proc/self/` has the same files for the process that reads them. They come from the kernel's process table when they are opened, so a terminal sees the processes of every client; an exec'd program shows under the pid its parent knows. `/proc/uptime`, `/proc/loadavg`, `/proc/stat` and `/proc/meminfo` are there too, and `/proc/mounts`. Pids, parents, process groups, sessions, command lines, terminals, start and boot times are real, and so is each process's memory: the size of its wasm memory (`VSZ` and `RSS` alike, as wasm has no paging), which `/proc/meminfo` counts as used. CPU times, load and `MemTotal` (from `navigator.deviceMemory`, else 4 GiB) are placeholders. Only Emscripten processes see this `/proc`.
+Every process of the kernel has `/proc/<pid>/` with `cmdline`, `comm`, `stat`, `statm` and `status`, in the formats procps reads, and `/proc/self` is a link to the `/proc/<pid>` of the process that reads it, as on Linux (`readlink /proc/self` is its pid, the one it was exec'd under included). They come from the kernel's process table when they are opened, so a terminal sees the processes of every client; an exec'd program shows under the pid its parent knows. `/proc/uptime`, `/proc/loadavg`, `/proc/stat` and `/proc/meminfo` are there too, and `/proc/mounts`. A process with no parent in the kernel (one a page, a client or the Node entry started) has parent 1, as children of init do, in `getppid()`, `/proc/<pid>/stat` and `ps` alike. Pids, parents, process groups, sessions, command lines, terminals, start and boot times are real, and so is each process's memory: the size of its wasm memory (`VSZ` and `RSS` alike, as wasm has no paging), which `/proc/meminfo` counts as used. CPU times, load and `MemTotal` (from `navigator.deviceMemory`, else 4 GiB) are placeholders. Only Emscripten processes see this `/proc`.
 
 While OPFS has no `/etc/passwd`, `/etc/group` or `/etc/mtab`, reading them gets per-process ones: root is uid 0 and the realm user, uid 1000, is named after `USER`, or `web_user` (Emscripten's default) without one, so it matches `$USER`, with `HOME` as its home, so `id`, `whoami`, `ls -l` and `ps` show names. Nothing is written to OPFS, and a real file there wins.
 

package/dist/kernel-worker.js

@@ -6919,8 +6919,10 @@ var VfsNodes = class {
     for (const [p, node] of this.byPath) if (within3(p, path)) await node.serial(() => node.flush());
   }
   async unlinking(path) {
-    const node = this.byPath.get(path);
-    if (node) await node.serial(async () => void await Promise.all([node.keep(), node.limit()]));
+    for (const [held, node] of [...this.byPath]) {
+      if (!within3(held, path)) continue;
+      await node.serial(async () => void await Promise.all([node.keep(), node.limit()]));
+    }
   }
   revoke(prefix) {
     for (const [path, node] of this.byPath) {
@@ -6930,10 +6932,11 @@ var VfsNodes = class {
     }
   }
   unlinked(path) {
-    const node = this.byPath.get(path);
-    if (!node) return;
-    node.orphaned = true;
-    this.byPath.delete(path);
+    for (const [held, node] of [...this.byPath]) {
+      if (!within3(held, path)) continue;
+      node.orphaned = true;
+      this.byPath.delete(held);
+    }
   }
   renamed(from, to) {
     if (from === to) return;
@@ -7007,6 +7010,23 @@ async function refuseReadonly(fs, path, flags, opts = {}) {
   const st = own ?? await stat(await targetDir(fs, path));
   if (st?.readonly) throw new KernelError("EROFS");
 }
+function keepingOpen(fs, nodes) {
+  return {
+    ...fs,
+    async rm(path, options) {
+      const at = fs.resolvePath("/", path);
+      await nodes.unlinking(at);
+      await fs.rm(path, options);
+      nodes.unlinked(at);
+    },
+    async rename(from, to) {
+      const [a, b] = [fs.resolvePath("/", from), fs.resolvePath("/", to)];
+      await nodes.unlinking(b);
+      await fs.rename(from, to);
+      nodes.renamed(a, b);
+    }
+  };
+}
 function vfsFile(fs, opts, nodes) {
   const access = opts.flags & O_ACCMODE;
   const readable = access !== O_WRONLY;
@@ -7202,8 +7222,8 @@ var WasmProcess = class {
     this.options = options;
     this.inherited = options.ignored ?? 0;
     this.children = new ChildTable(fds, options.spawner, options.forker);
-    this.nodes = new VfsNodes(options.fs);
-    options.openFiles?.add(this.nodes);
+    this.nodes = options.nodes ?? new VfsNodes(options.fs);
+    if (!options.nodes) options.openFiles?.add(this.nodes);
     this.children.onChildState = () => this.signal(SIG.CHLD);
     this.children.onReap = options.onReap;
   }
@@ -7706,7 +7726,7 @@ var WasmProcess = class {
     this.asyncOps.close();
     for (const pid of this.children.pids()) this.options.onReap?.(pid);
     await this.fds.closeAll();
-    this.options.openFiles?.delete(this.nodes);
+    if (!this.options.nodes) this.options.openFiles?.delete(this.nodes);
     await this.options.http?.closeAll();
   }
 };
@@ -7756,6 +7776,7 @@ function spawnWasmProcess(opts) {
     kill: opts.kill,
     processes: opts.processes,
     openFiles: opts.openFiles,
+    ...opts.nodes ? { nodes: opts.nodes } : {},
     mounts: opts.mounts,
     ...opts.mount ? { mount: opts.mount } : {},
     ...opts.umount ? { umount: opts.umount } : {},
@@ -9220,6 +9241,7 @@ var ENV_REFERENCE = /\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g;
 var WASM_MAGIC = [0, 97, 115, 109];
 var SHEBANG_MAX = 256;
 var NOT_FOUND = 127;
+var INIT_PID = 1;
 var SHARED_DIRS = ["/tmp", "/home"];
 var encoder3 = new TextEncoder();
 function baseName(path) {
@@ -9314,6 +9336,7 @@ var Launcher = class {
   fstabRetries;
   inserted = /* @__PURE__ */ new Map();
   openFiles = /* @__PURE__ */ new Set();
+  nodes;
   held = /* @__PURE__ */ new Set();
   processMounts;
   booting = new AbortController();
@@ -9347,7 +9370,10 @@ var Launcher = class {
       ca: this.ca
     });
     enableCdp(this.net, this.cdp);
-    this.fs = withCommandDirs(this.base, async () => new Set((await this.commands()).keys()));
+    const fs = withCommandDirs(this.base, async () => new Set((await this.commands()).keys()));
+    this.nodes = new VfsNodes(fs);
+    this.openFiles.add(this.nodes);
+    this.fs = keepingOpen(fs, this.nodes);
     this.watchers.watch([this.modulesDir, this.pnpmHome], { recursive: true }, () => {
       this.catalog = void 0;
     });
@@ -9520,6 +9546,7 @@ var Launcher = class {
       kill: (target, sig) => this.kill(target, sig),
       processes: () => ({ boot: this.boot, processes: this.list() }),
       openFiles: this.openFiles,
+      nodes: this.nodes,
       held: this.held,
       statfs: (path) => this.mounts.statfs(path),
       mounts: () => this.mounts.list(),
@@ -9575,7 +9602,7 @@ var Launcher = class {
     };
     const shown = (pid) => {
       const member = pid === void 0 ? void 0 : members.get(pid);
-      return member ? rootOf(member).pid : pid ?? 0;
+      return member ? rootOf(member).pid : INIT_PID;
     };
     const listed = [];
     for (const member of members.values()) {