@ai-ecoverse/slicc-kernel 1.33.0 → 1.34.0

package/README.md

@@ -65,7 +65,7 @@ Starts `argv` as the session leader on a new terminal and resolves once it is ru
 | --- | --- |
 | `pid` | the session leader's pid |
 | `onData` | the output listener; output that arrives while it is `null` is kept and delivered when one is set |
-| `write(data)` | types a string or bytes into the terminal; with `ISIG` on, `^C`, `^Z` and `^\` signal the foreground process group. A key typed while a child of that group is still setting up is held until the child has finished, then sent to the group in the foreground at that point. Setting up means the child's calls before its first other one: `setpgid`, `tcsetpgrp` and signal masks. The hold ends 250 ms after the child's first call at the latest. So `^Z` right after a command line stops the new job, as it does on Linux, where that setup takes microseconds rather than a worker start. |
+| `write(data)` | types a string or bytes into the terminal; with `ISIG` on, `^C`, `^Z` and `^\` signal the foreground process group. A key typed while a child of that group is still setting up is held until the child has finished, then sent to the group in the foreground at that point. Setting up means the child's calls before its first other one: `setpgid`, `tcsetpgrp`, signal masks, and starting the program it execs (which then sets itself up too). The hold ends 2 s after the child's first call at the latest. A key typed while the foreground group is busy, not reading the terminal (a shell between reading a command line and starting it), goes to that group and also to the job the group starts next, once that job has taken the terminal; the second copy is dropped when the group reads the terminal again. So `^C` or `^Z` right after a command line reaches the new job, as it does on Linux, where starting a job takes microseconds rather than a worker start. |
 | `resize(cols, rows)` | sets the window size (`TIOCGWINSZ`) and sends `SIGWINCH` to the foreground process group |
 | `signal(name)` | sends a signal (`'SIGINT'`, `'SIGTSTP'`, `'SIGQUIT'`, `'SIGHUP'`, …) to the foreground process group, regardless of termios |
 | `exited` | resolves with the session leader's exit status (`128 + n` if killed by signal `n`) |
@@ -334,6 +334,8 @@ The proxy answers `200` with `Content-Type: application/vnd.slicc.raw-fetch`: a
 
 Directories are renamed with `FileSystemHandle.move()` where available, else by copy and delete.
 
+`mmap` of a regular file works on every file system, for Emscripten programs built with `mmap` (whose glue exports `emscripten_builtin_memalign`) as well as for WASIX ones: the kernel reads the mapped range into fresh memory of the process, as Emscripten's MEMFS does. A `MAP_PRIVATE` mapping may be written, and its changes stay in the process. A writable `MAP_SHARED` mapping of such a file is `ENODEV`; a file in the process's own in-memory file system (MEMFS, as under `/dev`) keeps Emscripten's own mapping, which writes back. A read-only `MAP_SHARED` mapping is a copy taken at `mmap`, so later changes to the file do not show in it.
+
 ### Mounts
 
 `kernel.mount({ type, source, target, options })` mounts a file system on an existing directory. Every process sees it, Emscripten and WASI alike, and so does every attached client. `kernel.umount(target)` unmounts it, and fails with `EBUSY` while a process has a file open under it. `kernel.mounts()` lists the table, as does `/proc/mounts`. The Node entry and attached clients have the same three calls (client protocol 1.2).

package/dist/kernel-worker.js

@@ -6568,6 +6568,8 @@ var KernelTty = class {
   waiters = [];
   hungUp = false;
   name;
+  onRead;
+  readers = 0;
   screen;
   signal;
   constructor(screen, signal) {
@@ -6718,7 +6720,19 @@ var KernelTty = class {
     }
     this.screen.write(Uint8Array.from(out));
   }
+  get reading() {
+    return this.readers > 0;
+  }
   async read(max, signal) {
+    this.onRead?.();
+    this.readers++;
+    try {
+      return await this.take(max, signal);
+    } finally {
+      this.readers--;
+    }
+  }
+  async take(max, signal) {
     while (this.readable.length === 0) {
       if (this.hungUp) return new Uint8Array(0);
       await this.changed(signal);
@@ -6783,13 +6797,14 @@ var PtyPair = class {
   slaveSeen = false;
   index;
   onFree;
-  constructor(index, signal, onFree) {
+  constructor(index, signal, onFree, onRead) {
     this.index = index;
     this.onFree = onFree;
     this.slave = new KernelTty(
       { write: (bytes) => this.fromSlave(bytes) },
       (sig) => signal(this.slave, sig)
     );
+    if (onRead) this.slave.onRead = () => onRead(this.slave);
     this.slave.name = `/dev/pts/${index}`;
   }
   master() {
@@ -6887,13 +6902,15 @@ var PtyPair = class {
 var PtyTable = class {
   pairs = /* @__PURE__ */ new Map();
   signal;
-  constructor(signal) {
+  onRead;
+  constructor(signal, onRead) {
     this.signal = signal;
+    this.onRead = onRead;
   }
   open() {
     let index = 0;
     while (this.pairs.has(index)) index += 1;
-    const pair = new PtyPair(index, this.signal, (p) => this.pairs.delete(p.index));
+    const pair = new PtyPair(index, this.signal, (p) => this.pairs.delete(p.index), this.onRead);
     this.pairs.set(index, pair);
     return { pair, master: pair.master() };
   }
@@ -8446,6 +8463,7 @@ var WasmProcess = class {
   async exit() {
     if (this.exited) return;
     this.exited = true;
+    this.die();
     this.clearAlarm();
     this.interrupt.abort();
     this.options.locks?.release(this.pid);
@@ -8858,13 +8876,16 @@ var SETUP_OPS = /* @__PURE__ */ new Set([
   "fd-info",
   "sig-mask",
   "proc-setpgid",
-  "tty-pgrp-set"
+  "tty-pgrp-set",
+  "proc-exec",
+  "proc-spawn"
 ]);
-var SETTLE_MS = 250;
+var SETTLE_MS = 2e3;
 var KEY_SIGNALS = /* @__PURE__ */ new Set([2, 3, 20]);
 var SettlingChildren = class {
   children = /* @__PURE__ */ new Map();
   held = [];
+  parked = [];
   pgidOf;
   settleMs;
   constructor(pgidOf, settleMs = SETTLE_MS) {
@@ -8872,7 +8893,15 @@ var SettlingChildren = class {
     this.settleMs = settleMs;
   }
   started(pid, ppid) {
-    this.children.set(pid, { ppid });
+    const parent = this.children.get(ppid);
+    this.children.set(pid, parent ? { ppid: parent.ppid, execer: ppid } : { ppid });
+    const group = this.pgidOf(ppid);
+    for (const p of this.parked) if (p.pgid === group) this.held.push({ ...p, copy: true });
+    this.parked = this.parked.filter((p) => p.pgid !== group);
+  }
+  reading(pgid) {
+    this.parked = this.parked.filter((p) => p.pgid !== pgid);
+    this.held = this.held.filter((h) => !(h.copy && h.pgid === pgid));
   }
   syscall(pid, op) {
     const child = this.children.get(pid);
@@ -8888,13 +8917,25 @@ var SettlingChildren = class {
     if (!child) return;
     clearTimeout(child.timer);
     this.children.delete(pid);
+    if (child.execer !== void 0) this.settled(child.execer);
     const ready2 = this.held.filter((h) => !this.blocking(h.pgid));
     this.held = this.held.filter((h) => this.blocking(h.pgid));
     for (const h of ready2) h.send();
   }
-  deliver(sig, pgid, send) {
-    if (KEY_SIGNALS.has(sig) && this.blocking(pgid)) this.held.push({ pgid, send });
-    else send();
+  deliver(sig, pgid, send, foreground) {
+    if (!KEY_SIGNALS.has(sig)) {
+      send();
+    } else if (this.blocking(pgid)) {
+      this.held.push({ pgid, send });
+    } else if (foreground) {
+      send();
+      const moved2 = () => {
+        if (foreground() !== pgid) send();
+      };
+      this.parked.push({ pgid, send: moved2 });
+    } else {
+      send();
+    }
   }
   blocking(pgid) {
     for (const { ppid } of this.children.values()) if (this.pgidOf(ppid) === pgid) return true;
@@ -10164,11 +10205,8 @@ var Launcher = class {
   locks = new LockTable();
   settling = new SettlingChildren((pid) => this.jobs.pgidOf(pid));
   ptys = new PtyTable(
-    (tty, sig) => this.settling.deliver(
-      sig,
-      this.jobs.tcgetpgrp(tty, 0),
-      () => this.jobs.signalOwnedForeground(tty, sig)
-    )
+    (tty, sig) => this.keySignal(tty, 0, sig, () => this.jobs.signalOwnedForeground(tty, sig)),
+    (tty) => this.settling.reading(this.jobs.tcgetpgrp(tty, 0))
   );
   net = new LoopbackNet();
   cdp;
@@ -10584,6 +10622,11 @@ var Launcher = class {
       })
     );
   }
+  keySignal(tty, fallback, sig, send) {
+    const pgid = this.jobs.tcgetpgrp(tty, fallback);
+    const foreground = () => this.jobs.tcgetpgrp(tty, fallback);
+    this.settling.deliver(sig, pgid, send, tty.reading ? void 0 : foreground);
+  }
   ignoredBy(pid, fork = false) {
     return this.processes.get(pid)?.ignoredSignals(fork) ?? 0;
   }
@@ -10779,12 +10822,9 @@ var Launcher = class {
     let leader = 0;
     const tty = new KernelTty(
       { write: (bytes) => options.onData(bytes.slice()) },
-      (sig) => this.settling.deliver(
-        sig,
-        this.jobs.tcgetpgrp(tty, leader),
-        () => this.jobs.signalForeground(tty, leader, sig)
-      )
+      (sig) => this.keySignal(tty, leader, sig, () => this.jobs.signalForeground(tty, leader, sig))
     );
+    tty.onRead = () => this.settling.reading(this.jobs.tcgetpgrp(tty, leader));
     tty.name = `/dev/tty${++this.terminals}`;
     tty.setSize(options.cols ?? 80, options.rows ?? 24);
     const fds = new FdTable();