@ai-ecoverse/slicc-kernel 1.147.3 → 1.147.5

package/dist/node-process-worker.js

@@ -7157,7 +7157,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.147.3" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.147.5" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });

package/dist/node.js

@@ -3305,7 +3305,7 @@ function satisfies(version, range2) {
 }
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.147.3" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.147.5" : "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
@@ -18255,6 +18255,17 @@ var VfsNode = class {
     this.queue = next3.catch(() => void 0);
     return next3;
   }
+  named = 0;
+  byName(op) {
+    return this.serial(async () => {
+      this.named++;
+      try {
+        return await op();
+      } finally {
+        this.named--;
+      }
+    });
+  }
   revoke() {
     this.revoked = true;
     clearTimeout(this.writeBack);
@@ -18262,7 +18273,7 @@ var VfsNode = class {
     this.data = void 0;
     this.ranged = void 0;
   }
-  async prepare() {
+  async prepare(onFd = this.named === 0) {
     if (this.revoked) throw new KernelError("EIO");
     if (this.ranged || this.data) return this.ranged;
     const io = rangedOps(this.fs);
@@ -18277,15 +18288,15 @@ var VfsNode = class {
       this.ranged = new AsyncRangedFile(io, this.path, st.size ?? 0, st.version);
       return this.ranged;
     }
-    await this.load();
+    await this.load(onFd);
     return void 0;
   }
   async keep() {
-    const ranged2 = await this.prepare();
-    if (ranged2) await this.followed(() => ranged2.pin());
+    const ranged2 = await this.prepare(false);
+    if (ranged2) await this.followed(() => ranged2.pin(), false);
   }
   moving = /* @__PURE__ */ new Set();
-  async followed(op) {
+  async followed(op, onFd = this.named === 0) {
     for (; ; ) {
       const at = this.path;
       try {
@@ -18293,11 +18304,11 @@ var VfsNode = class {
       } catch (err) {
         if (!isMissing(err)) throw err;
         while (this.moving.size > 0) await Promise.all(this.moving);
-        if (this.path === at) throw err;
+        if (this.path === at) throw onFd && !this.made ? new KernelError("EIO") : err;
       }
     }
   }
-  async load() {
+  async load(onFd = this.named === 0) {
     if (this.revoked) throw new KernelError("EIO");
     while (!this.data) {
       const at = this.path;
@@ -18307,7 +18318,7 @@ var VfsNode = class {
         if (!isMissing(err)) throw err;
         while (this.moving.size > 0) await Promise.all(this.moving);
         if (this.path !== at) continue;
-        if (!this.made) throw new KernelError("ENOENT");
+        if (!this.made) throw new KernelError(onFd ? "EIO" : "ENOENT");
         this.data = new Uint8Array(0);
         this.missing = true;
       }
@@ -18812,7 +18823,7 @@ function heldIo(fs, nodes, changed) {
   const write = async (path, op, fallback) => {
     const held = await node(path);
     if (!held) return fallback();
-    const out = await held.serial(async () => {
+    const out = await held.byName(async () => {
       const done4 = await op(held);
       await held.flush();
       return done4;
@@ -18844,22 +18855,22 @@ function heldIo(fs, nodes, changed) {
     async stat(path) {
       const st = await fs.stat(path);
       const held = st.isFile ? await node(path) : void 0;
-      return held ? { ...st, size: await held.serial(() => held.size()) } : st;
+      return held ? { ...st, size: await held.byName(() => held.size()) } : st;
     },
     async lstat(path) {
       const st = await fs.lstat(path);
       const held = st.isFile && !st.isSymbolicLink ? await node(path) : void 0;
-      return held ? { ...st, size: await held.serial(() => held.size()) } : st;
+      return held ? { ...st, size: await held.byName(() => held.size()) } : st;
     },
     async readFileBuffer(path) {
       const held = await node(path);
       if (!held) return fs.readFileBuffer(path);
-      return held.serial(async () => held.pread(await held.size(), 0));
+      return held.byName(async () => held.pread(await held.size(), 0));
     },
     ...ranged2 ? {
       pread: async (path, at, n, version) => {
         const held = await node(path);
-        return held ? held.serial(() => held.pread(n, at)) : ranged2.pread(path, at, n, version);
+        return held ? held.byName(() => held.pread(n, at)) : ranged2.pread(path, at, n, version);
       },
       pwrite: (path, at, bytes, transfer) => write(
         path,
@@ -18912,7 +18923,7 @@ function keepingOpen(fs, nodes, changed = () => {
       const held = await heldAt(fs, nodes, at);
       if (!held) return nodes.onEntry(at, () => fs.writeFile(path, content, owner));
       const bytes = typeof content === "string" ? new TextEncoder().encode(content) : content;
-      return held.serial(async () => {
+      return held.byName(async () => {
         await held.truncate(0);
         await held.pwrite(bytes, 0);
         await held.flush();
@@ -29092,6 +29103,25 @@ var Launcher = class {
     const optional = `${root}-names${beside.slice(root.length)}`;
     return await this.base.exists(optional) ? optional : void 0;
   }
+  loaded(target, env, caller) {
+    const read = () => this.program(target, env, caller);
+    const id2 = () => this.exeId(target);
+    return id2().then(
+      (before) => read().then(
+        (first) => id2().then(
+          (after) => after.exeId === before.exeId ? [first, after] : this.reread(target, read).then(
+            (again) => id2().then((last) => [again, last])
+          )
+        )
+      )
+    );
+  }
+  reread(target, read) {
+    for (const key of this.compiled.keys()) {
+      if (key.startsWith(`${target.wasm}:`)) this.compiled.delete(key);
+    }
+    return read();
+  }
   exeId(target) {
     if (target.abi !== "wasi" || (target.copy ?? target.glue) !== target.wasm) {
       return Promise.resolve({});
@@ -29154,7 +29184,7 @@ var Launcher = class {
     try {
       const caller = { pid: req.ppid ?? 0, uid: req.cred.euid, tag: req.tags?.[0] };
       if (this.integrity) await this.checkedSources(planned, caller);
-      [program, exeId] = await Promise.all([this.program(target, env, caller), this.exeId(target)]);
+      [program, exeId] = await this.loaded(target, env, caller);
       if (readsEtcHostname(program)) setOrDrop(env, "HOSTNAME", own);
     } catch (err) {
       await req.fds.closeAll();