@ai-ecoverse/slicc-kernel 1.97.0 → 1.97.1

package/README.md

@@ -533,7 +533,8 @@ Directories are renamed with `FileSystemHandle.move()` where available, else by
 - **Capabilities:** `readonly`, `symlinks`, `links` (hard links: the driver answers `link(from, to)`, reports `nlink` in its attributes, and gives every attribute a stable `ino`, the same for all names of a file; a mount whose driver offers `links` but answers an attribute without `ino` loses them: `link` is `EPERM` there and `st_nlink` is 1), `chmod`, `owners`, `ranges`, `maxIo` (the largest read or write per message), `maxFile`, `listingStats`, `sessions`, `linkTimes`, and `attrTtl`/`entryTtl` (in ms, default 1000). `sessions` promises that a handle opened for writing keeps its writes to itself until it is released, so the kernel keeps one open per file being written instead of one per write (the `fsa` driver has it). `linkTimes` promises that `setattr` with `mtime` on a symlink sets the link's own time. Without it, setting a link's own times (`touch -h`, `utimensat` with `AT_SYMLINK_NOFOLLOW`) fails with `EOPNOTSUPP` and never reaches the target. tmpfs has it; hostfs does not. Setting times through a link follows it in the kernel, so `setattr` gets the target. `ranges` (driver protocol 1.1) promises that a write lands in the file at once, with no copy of the whole file on `open` or `release`, and that `setattr` takes `size`. `owners` (driver protocol 1.2) promises that the driver stores owners: its attributes carry `uid` and `gid`, `open` with `create`, `mkdir` and `symlink` may carry the new path's `uid`, `gid` and `mode` (the `owner` of the open flags, the second or third handler argument), a new path without them takes its directory's owner, and `setattr` takes `uid` and `gid`. tmpfs has it.
 - **Caching:** the kernel caches attributes and listings for those TTLs, and a driver can push `invalidate` for changes made outside.
 - **File contents:** on a mount with `ranges`, as `tmpfs` is, and on the root file system when it is in OPFS (in a browser with sync access handles) or an in-memory root, a program reads and writes a file in 64 KiB pages: reads come from the driver 1 MiB at a time, and changed pages go back in 1 MiB runs once 8 MiB have changed, at `fsync`, and when the file is closed (from the kernel's own descriptors also 250 ms after a write). A file of any size the mount can hold works, with memory to spare for about one more copy of it. In OPFS a write opens a sync access handle for just that write. An `fsa` mount (a picked folder) has no sync access handles, and Chrome copies the whole file into a swap file for every writable stream, so it writes through one stream per open file: the first write back opens it, later runs go into it at their offsets, and it is committed, one copy of the file, when the last process writing the file closes it (or exits), before another process reads what was written, and before a rename, unlink or unmount. Until then other processes see the new size but read the old bytes outside what was written. Elsewhere (`hostfs` with an older proxy, and a root outside OPFS), file contents are read whole when a program opens a file and written back when it closes it. Before a program's next call into the kernel (any wait, read of a pipe or terminal, sleep or spawn), its changed pages also go back, so other processes and the embedder see a write as soon as the writer does anything but compute: a daemon's pidfile, a log another process follows. On a whole-file mount that holds only for files of up to 64 KiB; a larger one goes back at close, fsync and exit, as before. Beyond that, both give close-to-open consistency, as NFS has. A process that ends without closing its files keeps what it wrote: on exit, on a trap, and when a signal kills it. For a killed WASI program, the kernel lets its worker write its changed pages back before `waitpid` reports the death. The only exception is a worker that makes no call into the kernel for 2 seconds after the signal; it is stopped without that write-back.
-- **One file, several processes** ([#665](https://github.com/ai-ecoverse/slicc-kernel/issues/665)): a process that keeps a file open sees what another process writes to it. Every change the kernel applies to a file (a write back, a truncate, an append, a rename or a removal) bumps a change ring the kernel shares with all its processes. Before each read, write or seek to the end, a process's open file checks the ring (one atomic load) and, if its file changed, drops its clean pages and reads the size again, keeping its own unwritten changes. A write by one process is visible to another one's next read once it has gone back to the kernel: at the latest at the writer's next `fsync`, close, exit or call into the kernel (see above), so sqlite, which `fsync`s every commit, sees another connection's commit at its next transaction. A write through a file the kernel holds (a JS program's `ctx.open`, a WASI program's file after a fork or spawn) is in the kernel already, so other processes see it at their next read, before it is written back. A file the kernel itself holds open (a JS program's file, a WASI program's file after a fork or spawn) is the one copy: reads, writes, truncates and appends by path from other processes go to it, and their writes go through to storage at once, so a commit is in storage (and in `kernel.readFile`) when the committing process returns from `fsync`. `O_APPEND` writes go to the kernel at once, and the kernel picks the offset, so appenders in several processes keep every line. A file system without ranged I/O (`hostfs` with an older proxy, a root outside OPFS) rereads a file another process changed, but writes it back whole, so two writers there still need locks. Limits for now: the same file under two names (a symlink in the path, a hard link, an alias on a mount without `realpath`) isn't kept coherent yet, so processes sharing a file should name it by the same path ([#669](https://github.com/ai-ecoverse/slicc-kernel/issues/669)); another tab's writes reach this tab's processes only as far as the root's change notifications (OPFS's `BroadcastChannel` watch) carry them; and byte-range locks (`fcntl` `F_SETLK`) are not enforced between processes yet (they come with the next change).
+- **One file, several processes** ([#665](https://github.com/ai-ecoverse/slicc-kernel/issues/665)): a process that keeps a file open sees what another process writes to it. Every change the kernel applies to a file (a write back, a truncate, an append, a rename or a removal) bumps a change ring the kernel shares with all its processes. Before each read, write or seek to the end, a process's open file checks the ring (one atomic load) and, if its file changed, drops its clean pages and reads the size again, keeping its own unwritten changes. A write by one process is visible to another one's next read once it has gone back to the kernel: at the latest at the writer's next `fsync`, close, exit or call into the kernel (see above), so sqlite, which `fsync`s every commit, sees another connection's commit at its next transaction. A write through a file the kernel holds (a JS program's `ctx.open`, a WASI program's file after a fork or spawn) is in the kernel already, so other processes see it at their next read, before it is written back. A file the kernel itself holds open (a JS program's file, a WASI program's file after a fork or spawn) is the one copy: reads, writes, truncates and appends by path from other processes go to it, and their writes go through to storage at once, so a commit is in storage (and in `kernel.readFile`) when the committing process returns from `fsync`. `O_APPEND` writes go to the kernel at once, and the kernel picks the offset, so appenders in several processes keep every line. A file system without ranged I/O (`hostfs` with an older proxy, a root outside OPFS) rereads a file another process changed, but writes it back whole, so two writers there still need locks. Limits for now: the same file under two names (a symlink in the path, a hard link, an alias on a mount without `realpath`) isn't kept coherent yet, so processes sharing a file should name it by the same path ([#669](https://github.com/ai-ecoverse/slicc-kernel/issues/669)); another tab's writes reach this tab's processes only as far as the root's change notifications (OPFS's `BroadcastChannel` watch) carry them.
+- **Locks between processes** ([#665](https://github.com/ai-ecoverse/slicc-kernel/issues/665)): an Emscripten program's `fcntl` byte-range locks (`F_SETLK`, `F_SETLKW`, `F_GETLK`) are the kernel's, so sqlite3 connections in different processes exclude each other: a second writer gets `database is locked` while the first holds its transaction, or waits with a busy timeout. The kernel keeps one table keyed by file identity (device and inode, so every name of a hard link is the same file), with POSIX semantics: locks belong to the process (an `exec`'d program keeps them under its pid; a forked child doesn't get them), a conflicting `F_SETLK` fails with `EAGAIN`, `F_GETLK` reports the holder's pid and range, `F_SETLKW` waits in the kernel without holding up anything else and a signal ends the wait with `EINTR`, a wait that would close a cycle between waiting processes fails with `EDEADLK`, a write lock on a descriptor not open for writing (or a read lock on one not open for reading) is `EBADF`, closing any descriptor of the file drops the process's locks on it, and exit releases them all. Before an unlock, the process writes back what it changed, so the next holder reads it. An open file's directory entry is checked against the change ring too: a name another process removed or replaced is looked up again, so sqlite's check for a hot journal sees the other connection's commit. A WASI imports module's `tryLock`/`unlock` keeps its behaviour (whole file, per process, keyed by path). Limits: locks are per kernel, not across tabs ([#675](https://github.com/ai-ecoverse/slicc-kernel/issues/675)); and a WASIX program's `fcntl` locks (python's `sqlite3`) are no-ops in its libc that never reach the kernel, until wasix-libc gets a kernel import for them ([homescoop#407](https://github.com/ai-ecoverse/homescoop/issues/407)), so python's sqlite doesn't exclude other processes yet.
 - **Rules on a mount:**
   - a rename across mounts is `EXDEV`, so `mv` copies;
   - a symlink on the root file system that leads onto a mount, such as `~/proj` → `/mnt/drive/proj`, or a chain from a mount to the root and back, is followed onto the mount by every operation, in every runtime: reads, writes, `stat`, listings, `mkdir`, removals, renames, `chmod`, `chown` and times. Removing the link itself removes the link. Before [#547](https://github.com/ai-ecoverse/slicc-kernel/issues/547) was fixed, the kernel resolved such a link against the directory under the mount point for JS and WASI programs, the embedder's `fs` and attached clients (Emscripten programs weren't affected): reads failed with `ENOENT`, and writes went into that hidden directory, which shows again once the mount is gone;

package/dist/kernel-worker.js

@@ -7695,10 +7695,10 @@ function envOf(pkg, raw) {
   }
   return env;
 }
-function envFields(merged) {
+function envFields(merged2) {
   const env = {};
   const unset = [];
-  for (const [key, value] of Object.entries(merged)) {
+  for (const [key, value] of Object.entries(merged2)) {
     if (value === null) unset.push(key);
     else env[key] = value;
   }
@@ -12054,7 +12054,7 @@ function mountTable(mounts = []) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.97.0" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.97.1" : "0.0.0-dev";
 var OS_RELEASE = "6.0.0-slicc";
 function procVersion() {
   return `Linux version ${OS_RELEASE} (slicc-kernel ${KERNEL_VERSION}) #1 SMP PREEMPT_DYNAMIC
@@ -12731,23 +12731,115 @@ async function epollSyscall(req, proc) {
   }
 }
 
-// src/kernel/host-ops.ts
-var HOST_OPS = [
-  "lock",
-  "unlock",
-  "async-submit",
-  "async-wait",
-  "async-take",
-  "async-resolve",
-  "async-hold",
-  "async-cancel",
-  "async-settle",
-  "async-close"
-];
-var json3 = (value) => ({ ok: true, kind: "json", json: value });
-var done2 = { ok: true, kind: "void" };
+// src/kernel/locks.ts
+var overlaps = (a, b) => a.start < b.end && b.start < a.end;
+var clashes = (lock, owner, want) => lock.owner !== owner && overlaps(lock, want) && (lock.kind === "write" || want.kind === "write");
+function lockRange(start2, len) {
+  if (!Number.isSafeInteger(start2) || !Number.isSafeInteger(len)) throw new KernelError("EINVAL");
+  const from = len < 0 ? start2 + len : start2;
+  const end = len === 0 ? Number.POSITIVE_INFINITY : len < 0 ? start2 : start2 + len;
+  if (from < 0) throw new KernelError("EINVAL");
+  return { start: from, end };
+}
 var LockTable = class {
+  records = /* @__PURE__ */ new Map();
+  blocked = /* @__PURE__ */ new Map();
+  wakers = /* @__PURE__ */ new Map();
   held = /* @__PURE__ */ new Map();
+  holder(key, owner, want) {
+    return this.records.get(key)?.find((lock) => clashes(lock, owner, want));
+  }
+  set(key, owner, kind, start2, end) {
+    if (kind !== "unlock" && this.holder(key, owner, { key, kind, start: start2, end })) return false;
+    const range = { start: start2, end };
+    const kept = [];
+    for (const lock of this.records.get(key) ?? []) {
+      if (lock.owner !== owner || !overlaps(lock, range)) kept.push(lock);
+      else {
+        if (lock.start < start2) kept.push({ ...lock, end: start2 });
+        if (lock.end > end) kept.push({ ...lock, start: end });
+      }
+    }
+    if (kind !== "unlock") kept.push({ owner, kind, start: start2, end });
+    this.store(key, merged(kept));
+    this.wake(key);
+    return true;
+  }
+  async wait(key, owner, kind, range, blocking) {
+    const want = { key, kind, ...range };
+    let signal;
+    for (; ; ) {
+      const holder = this.holder(key, owner, want);
+      if (!holder) {
+        this.set(key, owner, kind, range.start, range.end);
+        return;
+      }
+      if (this.waitsOn(holder.owner, owner)) throw new KernelError("EDEADLK");
+      signal ??= blocking();
+      if (signal.aborted) throw new KernelError("EINTR");
+      this.blocked.set(owner, want);
+      try {
+        await this.changed(key, signal);
+      } finally {
+        this.blocked.delete(owner);
+      }
+    }
+  }
+  waitsOn(from, target) {
+    const seen = /* @__PURE__ */ new Set();
+    for (let at = from; at !== void 0 && !seen.has(at); ) {
+      seen.add(at);
+      const want = this.blocked.get(at);
+      if (!want) return false;
+      const holder = this.holder(want.key, at, want);
+      if (!holder) return false;
+      if (holder.owner === target) return true;
+      at = holder.owner;
+    }
+    return false;
+  }
+  changed(key, signal) {
+    return new Promise((resolve2, reject) => {
+      const set2 = this.wakers.get(key) ?? /* @__PURE__ */ new Set();
+      this.wakers.set(key, set2);
+      const done4 = () => {
+        set2.delete(wake);
+        if (set2.size === 0 && this.wakers.get(key) === set2) this.wakers.delete(key);
+        signal.removeEventListener("abort", abort);
+      };
+      const wake = () => {
+        done4();
+        resolve2();
+      };
+      const abort = () => {
+        done4();
+        reject(new KernelError("EINTR"));
+      };
+      set2.add(wake);
+      signal.addEventListener("abort", abort, { once: true });
+    });
+  }
+  wake(key) {
+    for (const wake of [...this.wakers.get(key) ?? []]) wake();
+  }
+  store(key, locks) {
+    if (locks.length === 0) this.records.delete(key);
+    else this.records.set(key, locks);
+  }
+  holds(owner) {
+    for (const locks of this.records.values())
+      if (locks.some((l) => l.owner === owner)) return true;
+    return false;
+  }
+  dropFile(key, owner) {
+    const locks = this.records.get(key);
+    if (!locks?.some((l) => l.owner === owner)) return;
+    this.store(
+      key,
+      locks.filter((l) => l.owner !== owner)
+    );
+    this.wake(key);
+  }
   lock(pid, path, exclusive, fd) {
     const holders = this.held.get(path) ?? /* @__PURE__ */ new Map();
     for (const [other, h] of holders) if (other !== pid && (exclusive || h.exclusive)) return false;
@@ -12771,8 +12863,39 @@ var LockTable = class {
   }
   release(pid) {
     for (const path of [...this.held.keys()]) this.unlock(pid, path);
+    for (const key of [...this.records.keys()]) this.dropFile(key, pid);
   }
 };
+function merged(locks) {
+  const sorted = [...locks].sort((a, b) => a.owner - b.owner || a.start - b.start);
+  const out = [];
+  for (const lock of sorted) {
+    const last = out[out.length - 1];
+    if (last && last.owner === lock.owner && last.kind === lock.kind && last.end >= lock.start) {
+      last.end = Math.max(last.end, lock.end);
+    } else out.push({ ...lock });
+  }
+  return out;
+}
+
+// src/kernel/host-ops.ts
+var HOST_OPS = [
+  "lock",
+  "unlock",
+  "lk-set",
+  "lk-get",
+  "lk-close",
+  "async-submit",
+  "async-wait",
+  "async-take",
+  "async-resolve",
+  "async-hold",
+  "async-cancel",
+  "async-settle",
+  "async-close"
+];
+var json3 = (value) => ({ ok: true, kind: "json", json: value });
+var done2 = { ok: true, kind: "void" };
 var KEPT_OPS = /* @__PURE__ */ new Set(["fd-write"]);
 var unknownSettled = false;
 var AsyncOps = class {
@@ -12909,6 +13032,10 @@ async function hostSyscall(req, ctx) {
     case "unlock":
       ctx.locks?.unlock(ctx.pid, req.path);
       return done2;
+    case "lk-set":
+    case "lk-get":
+    case "lk-close":
+      return recordLock2(req, ctx);
     case "async-submit":
       if (!ctx.valid(req.req)) throw new KernelError("EINVAL");
       if (req.ack) ctx.ops.ack(req.ack);
@@ -12931,6 +13058,33 @@ async function hostSyscall(req, ctx) {
       return done2;
   }
 }
+async function recordLock2(req, ctx) {
+  const { locks, fileKey } = ctx;
+  if (!locks || !fileKey) throw new KernelError("ENOLCK");
+  const owner = ctx.owner?.() ?? ctx.pid;
+  const target = {
+    ...req.path !== void 0 ? { path: req.path } : {},
+    ...req.fd !== void 0 ? { fd: req.fd } : {}
+  };
+  if (req.op === "lk-close") {
+    locks.dropFile(await fileKey(target, "close"), owner);
+    return done2;
+  }
+  const range = lockRange(req.start, req.len);
+  const key = await fileKey(target, req.kind);
+  if (req.op === "lk-get") {
+    const held = locks.holder(key, owner, { key, kind: req.kind, ...range });
+    if (!held) return json3(null);
+    const len = held.end === Number.POSITIVE_INFINITY ? 0 : held.end - held.start;
+    return json3({ kind: held.kind, pid: held.owner, start: held.start, len });
+  }
+  if (req.kind !== "unlock" && req.wait) {
+    await locks.wait(key, owner, req.kind, range, ctx.blocking);
+    return done2;
+  }
+  if (!locks.set(key, owner, req.kind, range.start, range.end)) throw new KernelError("EAGAIN");
+  return done2;
+}
 
 // src/kernel/net/loopback-transport.ts
 var LOOPBACK_TRAITS = {
@@ -15461,6 +15615,8 @@ var WasmProcess = class {
       if (isHostSyscall(req)) {
         return await hostSyscall(req, {
           pid: this.pid,
+          owner: () => this.lockOwner(),
+          fileKey: (target, kind) => this.lockKey(target, kind),
           locks: this.options.locks,
           ops: this.asyncOps,
           blocking: () => this.blockingSignal(cancelled),
@@ -15487,6 +15643,44 @@ var WasmProcess = class {
       throw e;
     }
   }
+  lockOwners = /* @__PURE__ */ new Set();
+  lockChecked = /* @__PURE__ */ new Set();
+  lockOwner() {
+    const owner = this.options.jobs?.shown(this.pid) ?? this.pid;
+    this.lockOwners.add(owner);
+    return owner;
+  }
+  async lockPath(target, want) {
+    if (target.fd !== void 0) {
+      const st = await this.fds.get(target.fd).file.stat?.();
+      if (!st || st.orphan) throw new KernelError("EBADF");
+      return st.path;
+    }
+    if (target.path === void 0) throw new KernelError("EINVAL");
+    if (!target.path.startsWith("/")) throw new KernelError("EINVAL");
+    const path = target.path;
+    const g = this.guarded();
+    const checked = `${want}:${path}`;
+    if (g && want !== 0 && !this.lockChecked.has(checked)) {
+      await openable(g, "lock", path, want, false);
+      this.lockChecked.add(checked);
+    }
+    return path;
+  }
+  async lockKey(target, kind) {
+    const want = kind === "read" ? R_OK : kind === "write" ? W_OK : 0;
+    const path = await this.lockPath(target, want);
+    const st = await this.options.fs.stat?.(path);
+    if (!st) throw new KernelError("ENOENT");
+    return st.ino === void 0 ? path : `${st.dev ?? 0}:${st.ino}`;
+  }
+  async dropRecordLocks(fd) {
+    const { locks } = this.options;
+    const owner = this.options.jobs?.shown(this.pid) ?? this.pid;
+    if (!locks?.holds(owner) || !this.fds.has(fd)) return;
+    const key = await this.lockKey({ fd }, "close").catch(() => void 0);
+    if (key !== void 0) locks.dropFile(key, owner);
+  }
   refuseIfPending(restart) {
     if (restart && this.options.hasPending?.()) throw new KernelError("EINTR");
   }
@@ -15798,6 +15992,7 @@ var WasmProcess = class {
         };
       case "fd-close": {
         this.options.locks?.closed(this.pid, req.fd);
+        await this.dropRecordLocks(req.fd);
         const channel = this.fds.get(req.fd).file.clipboard;
         if (channel) channel.stamp = await this.clipboardStamp();
         await Promise.resolve(this.fds.close(req.fd)).catch(async (err) => {
@@ -16390,6 +16585,7 @@ var WasmProcess = class {
     this.clearAlarm();
     this.interrupt.abort();
     this.options.locks?.release(this.pid);
+    for (const owner of this.lockOwners) this.options.locks?.release(owner);
     this.asyncOps.close();
     for (const [target, sig] of this.deathSignals) this.sendDeath(target, sig);
     this.deathSignals.clear();