@ai-ecoverse/slicc-kernel 1.127.0 → 1.127.1

package/dist/kernel-worker.js

@@ -1330,7 +1330,7 @@ var OpfsFs = class {
   }
   async recounting(handle, target) {
     if (this.counted.length === 0) return;
-    const where = await this.root.resolve(handle).catch(() => null);
+    const where = await this.io(this.root.resolve(handle)).catch(() => null);
     await this.counting(where ? `/${where.join("/")}` : target);
   }
   resolvePath(base, path) {
@@ -1532,9 +1532,17 @@ var OpfsFs = class {
   }
   exact = 0;
   calls = 0;
+  others = 0;
   opfsCalls() {
     return this.calls;
   }
+  opfsOps() {
+    return this.calls + this.others;
+  }
+  io(request2) {
+    this.others++;
+    return request2;
+  }
   fresh() {
     this.changes++;
     this.absent.clear();
@@ -1558,7 +1566,13 @@ var OpfsFs = class {
     this.absent.set(path, performance.now());
   }
   remember(path, handle, looked = false) {
-    if (handle.kind !== "file") return handle;
+    if (handle.kind !== "file") {
+      if (looked) {
+        this.dirs.set(path, handle);
+        this.checked.set(handle, performance.now());
+      }
+      return handle;
+    }
     if (looked) {
       this.found.set(handle, performance.now());
       this.glances.delete(handle);
@@ -1939,7 +1953,7 @@ var OpfsFs = class {
   async readFileBuffer(path) {
     const bytes = await this.reading(
       path,
-      async (handle) => new Uint8Array(await (await handle.getFile()).arrayBuffer())
+      async (handle) => new Uint8Array(await (await this.io(handle.getFile())).arrayBuffer())
     );
     await this.refuseNode(path, bytes.length === 0);
     return bytes;
@@ -1947,7 +1961,7 @@ var OpfsFs = class {
   async readVersioned(path, cached = false) {
     return this.reading(path, async (handle) => {
       const stamp = await this.stamp(path, cached);
-      const file = await handle.getFile();
+      const file = await this.io(handle.getFile());
       const bytes = new Uint8Array(await file.arrayBuffer());
       await this.refuseNode(path, bytes.length === 0);
       return { bytes, version: `${file.lastModified}:${file.size}:${stamp}` };
@@ -1956,23 +1970,53 @@ var OpfsFs = class {
   async version(path, cached = false) {
     return this.reading(path, async (handle) => {
       const stamp = await this.stamp(path, cached);
-      const file = await handle.getFile();
+      const file = await this.io(handle.getFile());
       return `${file.lastModified}:${file.size}:${stamp}`;
     });
   }
   async pread(path, offset, length2) {
     return this.reading(path, async (handle) => {
-      const file = await handle.getFile();
+      const file = await this.io(handle.getFile());
       await this.refuseNode(path, file.size === 0);
       return new Uint8Array(await file.slice(offset, offset + length2).arrayBuffer());
     });
   }
   async pwrite(path, offset, bytes) {
-    const [handle, , target] = await this.fileFor(path);
+    const [kept, target] = await this.keptFor(path);
+    if (kept) {
+      try {
+        await this.writeAt(kept, target, path, offset, bytes);
+        return;
+      } catch (err) {
+        if (err.code !== "ENOENT") throw err;
+        this.files.delete(target);
+      }
+    }
+    const [handle] = await this.fileFor(path);
+    await this.writeAt(handle, target, path, offset, bytes);
+  }
+  async keptFor(path) {
+    const at = normalizePath(path);
+    const cached = this.files.get(at);
+    const fresh2 = cached && performance.now() - (this.found.get(cached) ?? -CHECK_MS) < CHECK_MS;
+    const [target, existed] = fresh2 ? [at, true] : await this.writeTarget(path);
+    if (!existed) return [void 0, target];
+    this.refuse(target);
+    const [entry] = await this.meta.get([target]);
+    if (entry?.fifo || entry?.socket) throw fsError("ENXIO", path);
+    const kept = fresh2 ? cached : this.files.get(target);
+    const usable2 = kept && performance.now() - (this.found.get(kept) ?? -CHECK_MS) < CHECK_MS;
+    return [usable2 ? kept : void 0, target];
+  }
+  async writeAt(handle, target, path, offset, bytes) {
     await this.counting(target);
     this.wrote(handle);
     try {
-      await this.retrying(path, () => positioned(handle, (io) => io.write(offset, bytes)), true);
+      await this.retrying(
+        path,
+        () => this.io(positioned(handle, (io) => io.write(offset, bytes))),
+        true
+      );
     } finally {
       this.wrote(handle);
       await this.recounting(handle, target);
@@ -1981,13 +2025,13 @@ var OpfsFs = class {
   }
   async truncate(path, size) {
     const handle = await this.existing(path, true);
-    await this.refuseNode(path, (await handle.getFile()).size === 0);
+    await this.refuseNode(path, (await this.io(handle.getFile())).size === 0);
     const resolve2 = this.ranged || this.remote?.watched();
     const target = resolve2 || this.counted.length > 0 ? (await this.locate(path, true)).path : path;
     await this.counting(target);
     this.wrote(handle);
     try {
-      await this.retrying(path, () => positioned(handle, (io) => io.truncate(size)), true);
+      await this.retrying(path, () => this.io(positioned(handle, (io) => io.truncate(size))), true);
     } finally {
       this.wrote(handle);
       await this.recounting(handle, target);
@@ -1998,7 +2042,7 @@ var OpfsFs = class {
     const [handle, , target] = await this.fileFor(path);
     const writable2 = await this.retrying(
       path,
-      () => handle.createWritable({ keepExistingData: !truncate }),
+      () => this.io(handle.createWritable({ keepExistingData: !truncate })),
       true
     );
     return {
@@ -2047,7 +2091,7 @@ var OpfsFs = class {
     try {
       const handle = await this.inDir(
         dir,
-        (parent) => parent.getFileHandle(name2, { create: true })
+        (parent) => this.io(parent.getFileHandle(name2, { create: true }))
       );
       if (!existed) this.touch(Date.now(), parentOf3(target));
       return [handle, existed, target];
@@ -2063,7 +2107,7 @@ var OpfsFs = class {
     let writable2;
     this.wrote(file);
     try {
-      writable2 = await file.createWritable();
+      writable2 = await this.io(file.createWritable());
       await writable2.write(content);
       await writable2.close();
     } catch (err) {
@@ -2079,6 +2123,7 @@ var OpfsFs = class {
     const handle = found.handle;
     if (handle.kind !== "directory") throw fsError("ENOTDIR", path);
     const children3 = /* @__PURE__ */ new Map();
+    this.others++;
     for await (const child of handle.values()) children3.set(child.name, child);
     for (const link2 of await this.meta.links(found.path)) {
       const name2 = baseOf(link2.path);
@@ -2132,7 +2177,7 @@ var OpfsFs = class {
     const parent = await this.locate(parentOf3(path), true);
     if (parent.handle?.kind !== "directory") throw fsError("ENOTDIR", path);
     this.refuse(resolvePath(parent.path, baseOf(path)));
-    await parent.handle.getDirectoryHandle(baseOf(path), { create: true });
+    await this.io(parent.handle.getDirectoryHandle(baseOf(path), { create: true }));
     const now = Date.now();
     const made2 = `${parent.path === "/" ? "" : parent.path}/${baseOf(path)}`;
     await this.stampNew(made2, owner, true);
@@ -2153,7 +2198,7 @@ var OpfsFs = class {
       if (found !== void 0 && !found.vacated) await this.meta.remove([path]);
       this.forget(physical);
       this.refuse(physical);
-      await dir.getDirectoryHandle(name2, { create: true });
+      await this.io(dir.getDirectoryHandle(name2, { create: true }));
       const now = Date.now();
       const made2 = `${parent.path === "/" ? "" : parent.path}/${name2}`;
       await this.stampNew(made2, owner, true);
@@ -2175,9 +2220,10 @@ var OpfsFs = class {
       if (found !== void 0 && !found.vacated) await this.meta.remove([path]);
       this.forget(physical);
       this.refuse(physical);
-      await dir.getFileHandle(name2, { create: true });
+      const handle = await this.io(dir.getFileHandle(name2, { create: true }));
       const now = Date.now();
       const made2 = `${parent.path === "/" ? "" : parent.path}/${name2}`;
+      this.remember(made2, handle, true);
       await this.stampNew(made2, owner, false);
       this.touch(now, parent.path, made2);
     });
@@ -2209,7 +2255,7 @@ var OpfsFs = class {
       try {
         await this.inDir(
           dir,
-          (parent) => parent.removeEntry(name2, { recursive: options.recursive === true })
+          (parent) => this.io(parent.removeEntry(name2, { recursive: options.recursive === true }))
         );
       } catch (err) {
         throw translate(err, path);
@@ -2450,7 +2496,9 @@ var OpfsFs = class {
     }
   }
   async place(handle, dir, name2) {
-    const moved2 = await handle.move?.(dir, name2).then(
+    const move = handle.move;
+    if (move) this.others++;
+    const moved2 = await move?.call(handle, dir, name2).then(
       () => true,
       () => false
     );
@@ -2460,7 +2508,7 @@ var OpfsFs = class {
       await this.copy(handle, dir, name2);
     } catch (err) {
       if (handle.kind === "directory" && this.fileMoves === before) {
-        await dir.removeEntry(name2, { recursive: true });
+        await this.io(dir.removeEntry(name2, { recursive: true }));
       }
       throw translate(err, name2);
     }
@@ -2469,6 +2517,7 @@ var OpfsFs = class {
   fileMoves = 0;
   async copy(handle, dir, name2) {
     if (handle.kind === "file" && movable(handle)) {
+      this.others++;
       const moved2 = await handle.move?.(dir, name2).then(
         () => true,
         () => false
@@ -2479,12 +2528,14 @@ var OpfsFs = class {
       }
     }
     if (handle.kind === "file") {
-      const writable2 = await (await dir.getFileHandle(name2, { create: true })).createWritable();
-      await writable2.write(await handle.getFile());
+      const made2 = await this.io(dir.getFileHandle(name2, { create: true }));
+      const writable2 = await this.io(made2.createWritable());
+      await writable2.write(await this.io(handle.getFile()));
       await writable2.close();
       return;
     }
-    const target = await dir.getDirectoryHandle(name2, { create: true });
+    const target = await this.io(dir.getDirectoryHandle(name2, { create: true }));
+    this.others++;
     for await (const child of handle.values()) await this.copy(child, target, child.name);
   }
   async symlink(target, path, owner) {
@@ -2557,7 +2608,7 @@ var OpfsFs = class {
       return;
     }
     const handle = found.handle;
-    const file = handle.kind === "file" ? await handle.getFile() : void 0;
+    const file = handle.kind === "file" ? await this.io(handle.getFile()) : void 0;
     this.dirTimes.delete(found.path);
     this.fileTimes.delete(found.path);
     const ctimeMs = Date.now();
@@ -6823,7 +6874,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.127.0" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.127.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
@@ -13268,6 +13319,8 @@ var SYS_TREE = {
     slicc_fs_calls: (listing) => `${listing.fsCalls ?? 0}
 `,
     slicc_opfs_calls: (listing) => `${listing.opfsCalls ?? 0}
+`,
+    slicc_opfs_ops: (listing) => `${listing.opfsOps ?? 0}
 `
   }
 };
@@ -26950,7 +27003,8 @@ var Launcher = class {
         wasm: this.memories.count(),
         peers: Number(this.locks.shared?.() === true),
         fsCalls: servedFsCalls(),
-        opfsCalls: this.rootFs.opfsCalls?.() ?? 0
+        opfsCalls: this.rootFs.opfsCalls?.() ?? 0,
+        opfsOps: this.rootFs.opfsOps?.() ?? 0
       }),
       sudo: (call, signal) => this.sudo(pid, call, signal),
       crontab: (call) => this.crontab(pid, call),