@ai-ecoverse/slicc-kernel 1.99.2 → 1.100.1

package/dist/process-worker.js

@@ -2475,7 +2475,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.99.2" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.100.1" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -4958,11 +4958,11 @@ function pages(bytes) {
 function ticks(ms) {
   return Math.max(0, Math.floor(ms * HZ / 1e3));
 }
-function pidStat(info, boot) {
+function pidStat(info, boot, state = info.state) {
   const fields = [
     info.pid,
     `(${commOf(info)})`,
-    info.state,
+    state,
     info.ppid,
     info.pgid,
     info.sid,
@@ -4999,6 +4999,13 @@ function pidStat(info, boot) {
   return `${fields.join(" ")}
 `;
 }
+function taskStat(info, tid, boot) {
+  const thread = (info.threads ?? [{ tid: 1, state: info.state }]).find((t) => t.tid === tid);
+  return thread && pidStat({ ...info, pid: tid }, boot, thread.state);
+}
+function taskIds(info) {
+  return (info.threads ?? [{ tid: 1 }]).map((t) => t.tid);
+}
 function pidStatus(info) {
   const state = STATES[info.state];
   const c = info.cred ?? ROOT;
@@ -5312,7 +5319,11 @@ var init_procfs = __esm({
 `, ostype: "Linux\n" }
     };
     sigMask = (mask = 0) => (mask >>> 1).toString(16).padStart(16, "0");
-    STATES = { S: "S (sleeping)", T: "T (stopped)", Z: "Z (zombie)" };
+    STATES = {
+      S: "S (sleeping)",
+      T: "T (stopped)",
+      Z: "Z (zombie)"
+    };
     tagLine = (tag) => `Tag:	${tag.replaceAll("\n", "\\n").replaceAll("	", "\\t").replaceAll("\r", "\\r")}`;
   }
 });
@@ -6665,6 +6676,69 @@ var init_wasi_files = __esm({
   }
 });
 
+// src/process/wasi/slicc-lock.ts
+function kindOf2(type) {
+  if (type === F_RDLCK2) return "read";
+  if (type === F_WRLCK2) return "write";
+  if (type === F_UNLCK2) return "unlock";
+  throw new WasiError("EINVAL");
+}
+function baseOf3(file, whence) {
+  if (whence === SEEK_SET) return 0;
+  if (whence === SEEK_CUR3) return file.offset();
+  if (whence === SEEK_END3) return file.size();
+  throw new WasiError("EINVAL");
+}
+function writeHolder2(view, at, found) {
+  if (!found) {
+    view.setInt16(at, F_UNLCK2, true);
+    return;
+  }
+  view.setInt16(at, found.kind === "read" ? F_RDLCK2 : F_WRLCK2, true);
+  view.setInt16(at + 2, SEEK_SET, true);
+  view.setBigInt64(at + 8, BigInt(found.start), true);
+  view.setBigInt64(at + 16, BigInt(found.len), true);
+  view.setInt32(at + 24, found.pid, true);
+}
+function lockImports(host) {
+  return {
+    fcntl_lock: (fd, cmd, at) => {
+      if (cmd !== F_GETLK2 && cmd !== F_SETLK2 && cmd !== F_SETLKW2) throw new WasiError("EINVAL");
+      const file = host.file(fd);
+      const view = host.mem.view();
+      const kind = kindOf2(view.getInt16(at, true));
+      const start2 = baseOf3(file, view.getInt16(at + 2, true)) + Number(view.getBigInt64(at + 8, true));
+      const len = Number(view.getBigInt64(at + 16, true));
+      if (cmd === F_GETLK2) {
+        if (kind === "unlock") throw new WasiError("EINVAL");
+        writeHolder2(view, at, host.calls.get(file.target, kind, start2, len));
+        return;
+      }
+      if (kind === "read" && file.readable === false || kind === "write" && file.writable === false)
+        throw new WasiError("EBADF");
+      if (kind !== "write") host.flush(file);
+      host.calls.set(file.target, kind, start2, len, cmd === F_SETLKW2);
+      if (kind !== "unlock") host.locked();
+    }
+  };
+}
+var F_GETLK2, F_SETLK2, F_SETLKW2, F_RDLCK2, F_WRLCK2, F_UNLCK2, SEEK_SET, SEEK_CUR3, SEEK_END3;
+var init_slicc_lock = __esm({
+  "src/process/wasi/slicc-lock.ts"() {
+    "use strict";
+    init_wasi_files();
+    F_GETLK2 = 12;
+    F_SETLK2 = 13;
+    F_SETLKW2 = 14;
+    F_RDLCK2 = 0;
+    F_WRLCK2 = 1;
+    F_UNLCK2 = 2;
+    SEEK_SET = 0;
+    SEEK_CUR3 = 1;
+    SEEK_END3 = 2;
+  }
+});
+
 // src/process/wasi/slicc-sem.ts
 function remainingMs(deadline, now) {
   if (deadline <= now) return 0;
@@ -7133,6 +7207,17 @@ var init_wasi_fds = __esm({
         }
         return out;
       }
+      locking = false;
+      holdLocks() {
+        this.locking = true;
+      }
+      dropLocks(e) {
+        if (!this.locking || e?.type !== "file") return;
+        try {
+          this.kernel.call({ op: "lk-close", path: e.file.path });
+        } catch {
+        }
+      }
       close(fd) {
         const e = this.get(fd);
         this.table.delete(fd);
@@ -7141,6 +7226,7 @@ var init_wasi_fds = __esm({
           this.kernel.sys.close(fd);
         } finally {
           this.release(e);
+          this.dropLocks(e);
           this.bump();
         }
       }
@@ -7159,6 +7245,7 @@ var init_wasi_fds = __esm({
           if (this.cloexec.delete(from)) this.cloexec.add(to);
         }
         if (old) this.release(old);
+        this.dropLocks(old);
         this.bump();
       }
       release(e) {
@@ -8229,6 +8316,7 @@ var init_wasi_host = __esm({
     init_physical_path();
     init_cpu_clock();
     init_cred();
+    init_slicc_lock();
     init_slicc_sem();
     init_wasi_abi();
     init_wasi_fds();
@@ -8451,6 +8539,26 @@ var init_wasi_host = __esm({
             void this.o.kernel.call({ op: "proc-setcred", change });
           },
           ...semImports(this),
+          ...lockImports({
+            mem,
+            file: (fd) => this.lockedFile(fd),
+            flush: (file) => {
+              if (file.path !== void 0) this.fds.flushPath(file.path);
+              else if (file.target.fd !== void 0) this.o.kernel.sys.flush(file.target.fd);
+            },
+            locked: () => this.fds.holdLocks(),
+            calls: {
+              set: (target, kind, start2, len, wait2) => void this.o.kernel.call({
+                op: "lk-set",
+                ...target,
+                kind,
+                start: start2,
+                len,
+                ...wait2 ? { wait: wait2 } : {}
+              }),
+              get: (target, kind, start2, len) => this.o.kernel.call({ op: "lk-get", ...target, kind, start: start2, len })
+            }
+          }),
           groups_get: (buf, cap, count) => {
             const { groups } = this.o.kernel.call({ op: "proc-cred" });
             if (cap !== 0 && cap < groups.length) throw new WasiError("EINVAL");
@@ -8843,6 +8951,26 @@ var init_wasi_host = __esm({
         }
         e.path = path;
       }
+      lockedFile(fd) {
+        const e = this.fds.get(fd);
+        if (e.type === "file") {
+          const { file } = e;
+          return {
+            target: { path: file.path },
+            path: file.path,
+            readable: file.readable,
+            writable: file.writable,
+            offset: () => file.offset,
+            size: () => file.size()
+          };
+        }
+        if (e.type !== "kernel" || this.fds.kind(fd, e) !== "file") throw new WasiError("EBADF");
+        return {
+          target: { fd },
+          offset: () => this.o.kernel.sys.seek(fd, 0, WHENCE.CUR),
+          size: () => this.kernelStat(fd).size
+        };
+      }
       kernelStat(fd) {
         return this.o.kernel.call({ op: "fd-vfs-stat", fd });
       }
@@ -9950,8 +10078,10 @@ var init_wasi_procfs = __esm({
             content: () => systemFile(top, this.listing(), Date.now(), this.memory)
           };
         }
-        if (!/^[1-9]\d*$/.test(top) || rest2.length > 0 || !this.alive(Number(top))) return void 0;
-        if (leaf === void 0) return { kind: "dir", names: () => [...PID_NAMES] };
+        if (!/^[1-9]\d*$/.test(top) || !this.alive(Number(top))) return void 0;
+        if (leaf === "task") return this.task(Number(top), rest2);
+        if (rest2.length > 0) return void 0;
+        if (leaf === void 0) return { kind: "dir", names: () => [...PID_NAMES, "task"] };
         if (!PID_NAMES.includes(leaf)) return void 0;
         return {
           kind: "file",
@@ -9963,6 +10093,28 @@ var init_wasi_procfs = __esm({
           }
         };
       }
+      info(pid) {
+        return this.listing().processes.find((p) => p.pid === pid);
+      }
+      task(pid, rest2) {
+        const [tid, leaf, ...more] = rest2;
+        const tids = () => taskIds(this.info(pid));
+        if (tid === void 0) return { kind: "dir", names: () => tids().map(String) };
+        if (!/^[1-9]\d*$/.test(tid) || more.length > 0 || !tids().includes(Number(tid)))
+          return void 0;
+        if (leaf === void 0) return { kind: "dir", names: () => ["stat"] };
+        if (leaf !== "stat") return void 0;
+        return {
+          kind: "file",
+          content: () => {
+            const listing = this.listing();
+            const info = listing.processes.find((p) => p.pid === pid);
+            const line = info && taskStat(info, Number(tid), listing.boot);
+            if (line === void 0) throw syncError("ENOENT", `/proc/${pid}/task/${tid}/stat`);
+            return line;
+          }
+        };
+      }
       parts(path, follow2) {
         const parts = path.split("/").filter((p) => p !== "").slice(1);
         if (parts[0] === "self" && (follow2 || parts.length > 1)) parts[0] = String(this.pid);
@@ -10298,6 +10450,18 @@ function mutableGlobals(exports) {
   }
   return out;
 }
+function reseatTls(exports, bytes) {
+  const init = exports.__wasm_init_tls;
+  const base = exports.__tls_base;
+  const size = exports.__tls_size;
+  if (typeof init !== "function" || !(base instanceof WebAssembly.Global) || !(size instanceof WebAssembly.Global)) {
+    return;
+  }
+  const at = base.value;
+  const block = bytes(at, size.value).slice();
+  init(at);
+  bytes(at, block.length).set(block);
+}
 var STACK_POINTER, UNWINDING, REWINDING, AsyncifyDriver;
 var init_wasix_fork = __esm({
   "src/process/wasi/wasix-fork.ts"() {
@@ -10348,6 +10512,7 @@ var init_wasix_fork = __esm({
         for (const [id, snap] of state.setjmps?.snapshots ?? []) this.snapshots.set(id, snap);
         this.nextSnapshot = Math.max(this.nextSnapshot, state.setjmps?.next ?? 1);
         this.restoreGlobals(state.globals);
+        reseatTls(this.exports, (at, length) => this.mem.bytes(at, length));
         this.answer = 0;
         this.exports.asyncify_start_rewind?.(state.asyncifyData);
       }
@@ -10996,6 +11161,7 @@ var init_wasix_linker = __esm({
     "use strict";
     init_dylink();
     init_wasi_files();
+    init_wasix_fork();
     init_wasix_trampoline();
     init_wasm_functypes();
     TABLE_BASE2 = 1;
@@ -11177,6 +11343,10 @@ var init_wasix_linker = __esm({
         const global = linked.instance.exports.__tls_base;
         if (base === void 0 || !(global instanceof WebAssembly.Global)) return false;
         global.value = base;
+        reseatTls(
+          linked.instance.exports,
+          (at, length) => new Uint8Array(this.memory.buffer, at, length)
+        );
         return true;
       }
       replay(record) {