@ai-ecoverse/slicc-kernel 1.17.0 → 1.17.1

package/README.md

@@ -244,6 +244,13 @@ Programs mount and unmount with `mount(2)` and `umount2(2)`, so a `mount`/`umoun
 - **Errors** are Linux's: `ENODEV` for an unknown type (or `hostfs` without a hook), `ENOENT` and `ENOTDIR` for the target, `EBUSY` for a target that is mounted already, and `EINVAL` for unmounting what is not a mount point.
 - **`/proc/mounts`** escapes spaces and backslashes as Linux does, and adds `nomedium` or `failed` to the options of a mount in that state.
 
+### 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.
+
+- **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`.

package/dist/kernel-worker.js

@@ -6299,8 +6299,9 @@ var WasmProcess = class {
       case "proc-fork":
         return { ok: true, kind: "json", json: await this.children.fork(req.state) };
       case "proc-spawn": {
-        const { file, argv, env, cwd, stdio, inherit } = req;
-        const pid = await this.children.spawn({ file, argv, env, cwd }, stdio, inherit);
+        const { file, argv, env, cwd, stdio, inherit, exec } = req;
+        const spawned = { file, argv, env, cwd, ...exec ? { exec } : {} };
+        const pid = await this.children.spawn(spawned, stdio, inherit);
         return { ok: true, kind: "json", json: pid };
       }
       case "proc-wait": {
@@ -6567,7 +6568,7 @@ function spawnWasmProcess(opts) {
     });
     const tinit = {
       type: WASM_THREAD_INIT,
-      pid: opts.pid,
+      pid: opts.shownPid ?? opts.pid,
       program: opts.program,
       argv0: opts.argv0,
       args: opts.args,
@@ -6581,7 +6582,7 @@ function spawnWasmProcess(opts) {
   };
   const init = {
     type: WASM_PROCESS_INIT,
-    pid: opts.pid,
+    pid: opts.shownPid ?? opts.pid,
     program: opts.program,
     argv0: opts.argv0,
     args: opts.args,
@@ -6631,12 +6632,22 @@ var JobTable = class {
   remove(pid) {
     this.members.delete(pid);
   }
-  exec(pid, child) {
+  exec(pid, child, adopt = false) {
     const member = this.members.get(child);
+    if (member && adopt) member.shownAs = this.shown(pid);
     if (member) member.execParent = pid;
     const execer = this.members.get(pid);
     if (execer) execer.execed = true;
   }
+  shown(pid) {
+    let member = this.members.get(pid);
+    for (let up = member; up; up = this.members.get(up.execParent ?? -1)) member = up;
+    return member?.pid ?? pid;
+  }
+  shownParent(pid) {
+    const parent = this.members.get(this.shown(pid))?.ppid;
+    return parent === void 0 ? void 0 : this.shown(parent);
+  }
   pgidOf(pid) {
     return this.members.get(pid)?.pgid;
   }
@@ -6645,34 +6656,46 @@ var JobTable = class {
     if (!member) throw new KernelError("ESRCH");
     return member;
   }
+  idOf(pid) {
+    return this.members.get(pid)?.shownAs ?? pid;
+  }
+  byId(id) {
+    for (const member of this.members.values()) if (member.shownAs === id) return member;
+    return this.member(id);
+  }
   setpgid(caller, pid, pgid) {
-    const target = this.member(pid || caller);
-    const group = pgid || target.pid;
+    const me = this.idOf(caller);
+    const target = this.byId(pid || me);
+    const id = this.idOf(target.pid);
+    const group = pgid || id;
     if (group < 0) throw new KernelError("EINVAL");
     const self = this.member(caller);
-    if (target.pid !== caller) {
-      if (target.ppid !== caller) throw new KernelError("ESRCH");
+    if (id !== me) {
+      if (target.ppid === void 0 || this.idOf(target.ppid) !== me) {
+        throw new KernelError("ESRCH");
+      }
       if (target.execed) throw new KernelError("EACCES");
     }
     if (target.sid !== self.sid) throw new KernelError("EPERM");
-    if (target.pid === target.sid) throw new KernelError("EPERM");
+    if (id === target.sid) throw new KernelError("EPERM");
     const exists = [...this.members.values()].some((m) => m.pgid === group && m.sid === target.sid);
-    if (group !== target.pid && !exists) throw new KernelError("EPERM");
+    if (group !== id && !exists) throw new KernelError("EPERM");
     target.pgid = group;
   }
   getpgid(caller, pid) {
-    return this.member(pid || caller).pgid;
+    return this.byId(pid || this.idOf(caller)).pgid;
   }
   getsid(caller, pid) {
-    return this.member(pid || caller).sid;
+    return this.byId(pid || this.idOf(caller)).sid;
   }
   setsid(pid) {
     const member = this.member(pid);
-    if (member.pgid === pid) throw new KernelError("EPERM");
-    member.sid = pid;
-    member.pgid = pid;
-    this.terminals.delete(pid);
-    return pid;
+    const id = this.idOf(pid);
+    if (member.pgid === id) throw new KernelError("EPERM");
+    member.sid = id;
+    member.pgid = id;
+    this.terminals.delete(id);
+    return id;
   }
   terminalNamed(name2) {
     const known = /* @__PURE__ */ new Set([...this.terminals.values(), ...this.foreground.keys()]);
@@ -6684,9 +6707,10 @@ var JobTable = class {
   }
   acquireTerminal(pid, tty) {
     const member = this.members.get(pid);
-    if (!member || member.sid !== pid || this.terminals.has(pid)) return false;
+    const id = this.idOf(pid);
+    if (!member || member.sid !== id || this.terminals.has(id)) return false;
     if ([...this.terminals.values()].includes(tty)) return false;
-    this.terminals.set(pid, tty);
+    this.terminals.set(id, tty);
     this.foreground.set(tty, member.pgid);
     return true;
   }
@@ -8022,10 +8046,11 @@ var Launcher = class {
       locks: this.locks,
       onReap: (child) => this.reaped(child),
       ...req.fork ? { fork: req.fork } : {},
-      ...req.ppid !== void 0 ? { ppid: req.ppid } : {}
+      ...this.shownIds(req)
     });
     this.processes.set(pid, handle);
     this.jobs.add(pid, req.ppid, (sig) => handle.signal(sig), terminal);
+    if (req.exec && req.ppid !== void 0) this.jobs.exec(req.ppid, pid, true);
     this.described.set(pid, {
       argv: [req.argv0, ...req.args],
       tty: terminal?.name ?? null,
@@ -8038,6 +8063,12 @@ var Launcher = class {
     });
     return handle;
   }
+  shownIds(req) {
+    if (req.ppid === void 0) return {};
+    if (!req.exec) return { ppid: this.jobs.shown(req.ppid) };
+    const ppid = this.jobs.shownParent(req.ppid);
+    return { shownPid: this.jobs.shown(req.ppid), ...ppid !== void 0 ? { ppid } : {} };
+  }
   forget(pid) {
     this.jobs.remove(pid);
     this.described.delete(pid);
@@ -8085,12 +8116,21 @@ var Launcher = class {
         await fds.closeAll();
         throw new SpawnError(await this.unrunnable(req.file, req.cwd));
       }
-      const handle = await this.launch(planned, { env: req.env, cwd: req.cwd, fds, report, ppid });
+      const exec = req.exec ? { exec: true } : {};
+      const handle = await this.launch(planned, {
+        env: req.env,
+        cwd: req.cwd,
+        fds,
+        report,
+        ppid,
+        ...exec
+      });
       return childHandle(handle);
     };
   }
   forker(ppid, parent) {
-    return async (state, fds) => childHandle(this.start({ ...parent, cwd: state.cwd ?? parent.cwd, fds, ppid, fork: state }));
+    const { exec: _exec, ...image } = parent;
+    return async (state, fds) => childHandle(this.start({ ...image, cwd: state.cwd ?? parent.cwd, fds, ppid, fork: state }));
   }
   kill(pid, sig) {
     if (pid < 0) return this.jobs.killGroup(-pid, sig);