@ai-ecoverse/slicc-kernel 1.120.0 → 1.120.2

package/dist/node.js

@@ -3998,6 +3998,14 @@ var RemoteWatch = class {
   met;
   settled = false;
   quiet;
+  crowd;
+  told;
+  recount() {
+    const now = this.crowded();
+    if (now === this.told) return;
+    this.told = now;
+    this.crowd?.(now);
+  }
   constructor(name2, options = {}) {
     this.name = name2;
     this.locks = options.locks === void 0 ? lockManager() : options.locks ?? void 0;
@@ -4014,6 +4022,7 @@ var RemoteWatch = class {
     });
     this.joined = granted2.then(() => this.join()).then(() => {
       this.settled = true;
+      this.recount();
     });
     this.channel.postMessage({ hello: this.tab });
   }
@@ -4046,6 +4055,7 @@ var RemoteWatch = class {
     if (data.hello !== void 0) this.greeted(data.hello);
     if (data.here !== void 0 && data.to === this.tab) {
       this.peers.add(data.here);
+      this.recount();
       this.met?.();
     }
     if (data.tab !== void 0 && data.paths !== void 0) this.announced(data);
@@ -4056,6 +4066,7 @@ var RemoteWatch = class {
   }
   greeted(peer) {
     this.peers.add(peer);
+    this.recount();
     const answer = () => {
       this.channel.postMessage({ here: this.tab, to: peer });
       if (this.mine.length > 0) void this.announce(this.mine);
@@ -4066,6 +4077,7 @@ var RemoteWatch = class {
   announced({ tab, paths, seq: seq2 }) {
     const from = tab;
     this.peers.add(from);
+    this.recount();
     if (paths.length > 0) this.others.set(from, paths);
     else this.others.delete(from);
     this.rebuild();
@@ -4091,6 +4103,7 @@ var RemoteWatch = class {
       }
     }
     this.rebuild();
+    this.recount();
   }
   watched() {
     return this.union.size > 0;
@@ -4319,7 +4332,7 @@ var OpfsFs = class {
     this.rootName = channel;
     this.channel = channel === void 0 ? void 0 : new BroadcastChannel(channel);
     this.remote = channel === void 0 ? void 0 : new RemoteWatch(`${channel}:watch`);
-    if (this.remote) this.remote.quiet = () => this.quiet();
+    if (this.remote) this.remote.quiet = () => this.quiet().then(() => this.settle?.());
     if (this.channel) {
       const remote = this.remote;
       meta.listen?.(
@@ -4474,6 +4487,22 @@ var OpfsFs = class {
       if (this.unlocked === 0) for (const done4 of this.idle.splice(0)) done4();
     }
   }
+  settle;
+  onPeer(settle) {
+    this.settle = settle;
+  }
+  peers() {
+    const remote = this.remote;
+    if (!remote) return void 0;
+    return {
+      joined: () => remote.peered(),
+      crowded: () => remote.crowded(),
+      watch: (listener) => {
+        remote.crowd = listener;
+        listener(remote.crowded());
+      }
+    };
+  }
   quiet() {
     if (this.unlocked === 0) return Promise.resolve();
     return new Promise((resolve2) => this.idle.push(resolve2));
@@ -6747,7 +6776,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.120.0" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.120.2" : "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
@@ -8750,7 +8779,8 @@ var RING = 1;
 var RING_SIZE = 4096;
 var SLOT = 2;
 var DIRTY = RING + RING_SIZE * SLOT;
-var CHANGES_BYTES = (DIRTY + 1) * 4;
+var FOREIGN = DIRTY + 1;
+var CHANGES_BYTES = (FOREIGN + 1) * 4;
 function changeHash(path) {
   let h = 2166136261;
   for (let i = 0; i < path.length; i++) {
@@ -8778,6 +8808,9 @@ var FileChanges = class {
   dirtied(delta) {
     Atomics.add(this.view, DIRTY, delta);
   }
+  foreign(on) {
+    Atomics.store(this.view, FOREIGN, on ? 1 : 0);
+  }
   publish(...paths) {
     for (const path of paths) {
       const g = Atomics.add(this.view, GEN, 1) + 1 | 0;
@@ -13739,10 +13772,14 @@ async function flock(req, ctx) {
   if (!locks || !flockOf) throw new KernelError("ENOLCK");
   if (!FLOCK_KINDS.has(req.kind)) throw new KernelError("EINVAL");
   const { key, owner } = await flockOf(req.fd);
+  const granted2 = req.kind !== "unlock";
+  const shared = locks.shared?.() === true;
+  if (shared && !granted2) await ctx.settle?.(req.fd, false);
   if (req.kind !== "unlock" && req.wait)
     await locks.flocks.wait(key, owner, req.kind, ctx.blocking);
   else if (!await locks.flocks.set(key, owner, req.kind)) throw new KernelError("EAGAIN");
-  return done2;
+  if (shared && granted2) await ctx.settle?.(req.fd, true);
+  return shared ? json3(true) : done2;
 }
 async function recordLock2(req, ctx) {
   const { locks, fileKey } = ctx;
@@ -13753,6 +13790,7 @@ async function recordLock2(req, ctx) {
     ...req.fd !== void 0 ? { fd: req.fd } : {}
   };
   if (req.op === "lk-close") {
+    if (req.fd !== void 0 && locks.shared?.()) await ctx.settle?.(req.fd, false);
     locks.dropFile(await fileKey(target, "close"), owner);
     return done2;
   }
@@ -13764,13 +13802,16 @@ async function recordLock2(req, ctx) {
     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) {
+  const granted2 = req.kind !== "unlock";
+  const shared = locks.shared?.() === true;
+  const fd = shared ? req.fd : void 0;
+  if (!granted2 && fd !== void 0) await ctx.settle?.(fd, false);
+  if (req.kind !== "unlock" && req.wait)
     await locks.wait(key, owner, req.kind, range2, ctx.blocking);
-    return done2;
-  }
-  if (!await locks.set(key, owner, req.kind, range2.start, range2.end))
+  else if (!await locks.set(key, owner, req.kind, range2.start, range2.end))
     throw new KernelError("EAGAIN");
-  return done2;
+  if (granted2 && fd !== void 0) await ctx.settle?.(fd, true);
+  return shared ? json3(true) : done2;
 }
 
 // src/kernel/net/loopback-transport.ts
@@ -16922,6 +16963,11 @@ var VfsNode = class {
   holds() {
     return this.dirty;
   }
+  reread() {
+    if (this.dirty || this.orphaned || this.pin || this.revoked) return;
+    this.data = void 0;
+    this.ranged = void 0;
+  }
   replace(contents2) {
     this.ranged = void 0;
     this.data = new Uint8Array(contents2);
@@ -17549,6 +17595,7 @@ function vfsFile(fs, opts, nodes) {
     })),
     known: () => node.known(),
     flush: () => serial(() => node.flush()),
+    reread: () => serial(async () => node.reread()),
     close: () => node.serial(async () => {
       try {
         takeOpenError();
@@ -18031,6 +18078,7 @@ var WasmProcess = class {
           owner: () => this.lockOwner(),
           fileKey: (target, kind, setting) => this.lockKey(target, kind, setting),
           flockOf: (fd) => this.flockOf(fd),
+          settle: (fd, granted2) => this.settle(fd, granted2),
           locks: this.options.locks,
           ops: this.asyncOps,
           blocking: () => this.blockingSignal(cancelled),
@@ -18114,6 +18162,11 @@ var WasmProcess = class {
     else if (this.pathKeys.size < 4096) this.pathKeys.set(path, key);
     return key;
   }
+  async settle(fd, granted2) {
+    const file = this.fds.has(fd) ? this.fds.get(fd).file : void 0;
+    if (granted2) await file?.reread?.();
+    else await file?.flush?.();
+  }
   async flockOf(fd) {
     const open = this.fds.get(fd);
     const { locks } = this.options;
@@ -19799,13 +19852,20 @@ var LockService = class {
     };
     void this.locks.request(this.aliveOf(this.kernel), () => new Promise(() => {
     }));
-    this.role = this.elect();
+    const peers = options.peers;
+    this.role = peers ? Promise.all([this.elect(), peers.joined()]).then(() => void 0) : this.elect();
+    this.peers = options.peers;
     this.flocks = {
       set: (key, owner, kind) => this.flockSet(key, owner, kind),
       wait: (key, owner, kind, blocking) => this.flockWait(key, owner, kind, blocking),
       drop: (owner) => this.flockDrop(owner)
     };
   }
+  peers;
+  shared() {
+    if (!this.leader || this.ownerOf.size > 0 || this.tokens.size > 0) return true;
+    return this.peers?.crowded() === true;
+  }
   aliveOf(kernel) {
     return `slicc-locks-alive:${LOCKS_PROTOCOL}:${this.root}:${kernel}`;
   }
@@ -20066,11 +20126,11 @@ var LockService = class {
     this.table.closed(pid, fd);
   }
 };
-function kernelLocks(root) {
+function kernelLocks(root, peers) {
   const locks = globalThis.navigator?.locks;
   if (root === void 0 || !locks || typeof BroadcastChannel !== "function")
     return new LockTable();
-  return new LockService({ root, locks });
+  return new LockService({ root, locks, ...peers ? { peers } : {} });
 }
 var ASK_OPS = /* @__PURE__ */ new Set([
   "set",
@@ -23526,7 +23586,9 @@ var Launcher = class {
   constructor(options) {
     this.usersMode = usersMode(options.users);
     this.rootFs = options.fs;
-    this.locks = kernelLocks(options.fs.rootName);
+    const peers = options.fs.peers?.();
+    this.locks = kernelLocks(options.fs.rootName, peers);
+    peers?.watch((crowded) => this.changes.foreign(crowded));
     this.dac = this.usersMode === "off" ? void 0 : new Dac(this.usersMode, options.onDenial);
     if (this.dac) this.dac.tagOf = (pid) => this.tagOf(pid);
     this.clipboard = new ClipboardBroker(
@@ -23607,6 +23669,7 @@ var Launcher = class {
     this.nodes = new VfsNodes(fs, (path) => this.released(path));
     this.nodes.keepsOnDisk = true;
     this.openFiles.add(this.nodes);
+    options.fs.onPeer?.(() => this.flushOpen());
     const holders = [this.held, this.openFiles];
     this.unlinked = new UnlinkedKeeper(
       fs,
@@ -25267,6 +25330,9 @@ var Launcher = class {
     this.writers ??= this.writerStack();
     return this.writers;
   }
+  async flushOpen() {
+    for (const nodes of this.openFiles) await nodes.flush("/").catch(() => void 0);
+  }
   writerStack() {
     const mounted = this.mounts.wrap(this.unguardedRoot);
     const fs = this.commandFs(this.rooted(mounted));