@ai-ecoverse/slicc-kernel 1.41.2 → 1.41.4

package/README.md

@@ -429,7 +429,7 @@ An exec'd program takes over the pid of the process it replaces, as on Linux: `g
 
 ### File modes and the umask
 
-Every process has a umask in the kernel, `022` for a process the embedder starts, inherited across fork, spawn and exec and shown in `/proc/<pid>/status` (`Umask:`). The kernel applies it when a program creates a file or directory, whatever its libc does: an Emscripten program's `open` with `O_CREAT`, `mkdir` and `mknod` (so `umask 077; touch f` gives `600` in a child too), and a WASI program's `path_open` with `O_CREAT` and `path_create_directory` (`0666` and `0777` less the umask).
+Every process has a umask in the kernel, `022` for a process the embedder starts, inherited across fork, spawn and exec and shown in `/proc/<pid>/status` (`Umask:`). The kernel applies it when a program creates a file or directory, whatever its libc does: an Emscripten program's `open` with `O_CREAT`, `mkdir` and `mknod` (so `umask 077; touch f` gives `600` in a child too), and a WASI program's `path_open` with `O_CREAT` and `path_create_directory` (`0666` and `0777` less the umask). An Emscripten program's `umask()` sets and reads the kernel's umask through the glue's `__syscall_umask` import, so `umask 077` in bash shows in `/proc` and reaches every child. A build that resolves `umask` inside its wasm, as wasm-bash 5.3.0-8 to 5.3.0-10 do, keeps a umask of its own that the kernel never sees.
 
 WASI and WASIX have no call for file modes, so the kernel adds the import module `slicc_fs`, whose functions return a preview1 errno (kernels without them answer `ENOSYS`):
 

package/dist/kernel-worker.js

@@ -5705,6 +5705,7 @@ var ChildTable = class {
     });
     handle.onState?.((state, sig) => {
       child.stopReport = state === "stopped" ? sig : void 0;
+      child.stoppedBy = child.stopReport;
       child.continueReport = state === "continued";
       this.watchers.get(handle.pid)?.(state, sig);
       const waiters = this.stateChanged;
@@ -5716,7 +5717,10 @@ var ChildTable = class {
     return handle.pid;
   }
   watch(pid, listener) {
-    if (this.children.has(pid)) this.watchers.set(pid, listener);
+    const child = this.children.get(pid);
+    if (!child) return;
+    this.watchers.set(pid, listener);
+    if (child.stoppedBy !== void 0) listener("stopped", child.stoppedBy);
   }
   openSlot(slot, n, captured) {
     if ("fd" in slot) return this.parentFds.get(slot.fd).retain();
@@ -8985,6 +8989,7 @@ var WasmProcess = class {
   dying = false;
   umask = DEFAULT_UMASK;
   execChild;
+  killed = false;
   execTermsig;
   stopped = 0;
   stops = 0;
@@ -9022,7 +9027,10 @@ var WasmProcess = class {
       this.wake?.();
       return "forward";
     }
-    if (sig === SIG.KILL) return "terminate";
+    if (sig === SIG.KILL) {
+      this.killed = true;
+      return "terminate";
+    }
     if (sig === SIG.CONT) this.cont();
     if (sig === SIG.STOP) return this.stop(sig);
     const bit = sigbit(sig);
@@ -9040,6 +9048,19 @@ var WasmProcess = class {
     blocked.abort();
     return "deliver";
   }
+  async spawn(req) {
+    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);
+    if (!exec) return pid;
+    if (this.killed) void Promise.allSettled([this.options.kill?.(pid, SIG.KILL)]);
+    else this.adoptExec(pid);
+    return pid;
+  }
+  adoptExec(pid) {
+    this.execChild = pid;
+    this.children.watch(pid, (state, sig) => state === "stopped" ? this.stop(sig) : this.cont());
+  }
   onState(listener) {
     this.stateListeners.push(listener);
   }
@@ -9445,12 +9466,8 @@ var WasmProcess = class {
     switch (req.op) {
       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, 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-spawn":
+        return { ok: true, kind: "json", json: await this.spawn(req) };
       case "proc-wait": {
         const signal = req.nohang ? this.interrupt.signal : this.blockingSignal();
         const flags = {
@@ -9464,12 +9481,8 @@ var WasmProcess = class {
       case "proc-identity":
         return { ok: true, kind: "json", json: await this.options.identity?.() ?? null };
       case "proc-exec": {
-        this.execChild = req.pid;
+        this.adoptExec(req.pid);
         this.options.jobs?.exec(this.pid, req.pid);
-        this.children.watch(
-          req.pid,
-          (state, sig) => state === "stopped" ? this.stop(sig) : this.cont()
-        );
         await this.fds.closeAll();
         try {
           const waited = await this.children.wait(req.pid, false);