@ai-ecoverse/slicc-kernel 1.100.0 → 1.100.2

package/dist/node.js

@@ -3030,7 +3030,7 @@ async function runTagged(l, self, requested, tag) {
 }
 function processes(l, self) {
   const viewer = credOf(self);
-  return l.list(viewer).map(({ tid: _, cred = viewer, umask: _umask, ...entry }) => ({
+  return l.list(viewer).map(({ tid: _, cred = viewer, umask: _umask, threads: _threads, ...entry }) => ({
     ...entry,
     rss: entry.memory,
     uid: cred.euid,
@@ -10572,6 +10572,13 @@ var ProcessClocks = class {
   running() {
     return this.enabled ? this.all().filter((c) => c.running()).length : 0;
   }
+  states() {
+    const state = (c) => c.running() ? "R" : "S";
+    return [
+      { tid: 1, state: state(this.main) },
+      ...[...this.threads].map(([tid, c]) => ({ tid, state: state(c) }))
+    ];
+  }
   timed(clock, dispatch2) {
     const c = clock ?? this.main;
     const block = () => c.block();
@@ -11100,7 +11107,7 @@ var PATH_OPS = new Set(SYNC_FS_OPS);
 var EARLY_WHOLE_FILE = 64 * 1024;
 
 // src/version.ts
-var KERNEL_VERSION = true ? "1.100.0" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.100.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
@@ -11160,11 +11167,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,
@@ -11202,8 +11209,19 @@ function pidStat(info, boot) {
 `;
 }
 var sigMask = (mask = 0) => (mask >>> 1).toString(16).padStart(16, "0");
-var STATES = { S: "S (sleeping)", T: "T (stopped)", Z: "Z (zombie)" };
+var STATES = {
+  S: "S (sleeping)",
+  T: "T (stopped)",
+  Z: "Z (zombie)"
+};
 var tagLine = (tag) => `Tag:	${tag.replaceAll("\n", "\\n").replaceAll("	", "\\t").replaceAll("\r", "\\r")}`;
+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;
@@ -11381,8 +11399,10 @@ var ProcTree = class {
         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",
@@ -11394,6 +11414,28 @@ var ProcTree = class {
       }
     };
   }
+  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 parts2 = path.split("/").filter((p) => p !== "").slice(1);
     if (parts2[0] === "self" && (follow2 || parts2.length > 1)) parts2[0] = String(this.pid);
@@ -14204,6 +14246,13 @@ var SEM_NAMES_MAX = 4096;
 var SEM_HANDLES_MAX = 256;
 var NAME_MAX = 251;
 var TIMER_MAX_MS = 2147483647;
+var deadlines = /* @__PURE__ */ new WeakMap();
+function timeLeft(req, timeoutMs) {
+  const now = performance.now();
+  const deadline = deadlines.get(req) ?? now + timeoutMs;
+  deadlines.set(req, deadline);
+  return Math.max(0, deadline - now);
+}
 var SEM_OPS = [
   "sem-open",
   "sem-close",
@@ -14390,8 +14439,9 @@ async function semSyscall(req, proc) {
       const sem = handles.get(req.handle);
       if (sem.take()) return ok2();
       if (req.how === "try") throw new KernelError("EAGAIN");
-      if (req.how === "timed" && req.timeoutMs === 0) throw new KernelError("ETIMEDOUT");
-      const got = await sem.wait(proc.blocking(), req.how === "block" ? -1 : req.timeoutMs);
+      const timeoutMs = req.how === "block" ? -1 : timeLeft(req, req.timeoutMs);
+      if (timeoutMs === 0) throw new KernelError("ETIMEDOUT");
+      const got = await sem.wait(proc.blocking(), timeoutMs);
       if (!got) throw new KernelError("ETIMEDOUT");
       return ok2();
     }
@@ -17045,8 +17095,14 @@ function spawnWasmProcess(opts) {
     umask: () => process2.umask,
     cred: () => copyCred(process2.cred),
     writesBack: () => opts.program.abi === "wasi" && !done4,
+    ...clockViews(clocks)
+  };
+}
+function clockViews(clocks) {
+  return {
     times: () => clocks.times(),
-    running: () => clocks.running()
+    running: () => clocks.running(),
+    threads: () => clocks.states()
   };
 }
 
@@ -21568,6 +21624,7 @@ var Launcher = class {
         ...described2,
         started: (this.described.get(root.pid) ?? described2).started,
         state: this.stateOf(member.pid),
+        ...this.threadsOf(member.pid),
         memory: this.processes.get(member.pid)?.memory() ?? 0,
         ...this.timesOf(member, members),
         ...this.childrenOf(root.pid),
@@ -21579,6 +21636,10 @@ var Launcher = class {
     }
     return listed;
   }
+  threadsOf(pid) {
+    const threads = this.stateOf(pid) === "S" ? this.processes.get(pid)?.threads?.() : void 0;
+    return threads ? { threads } : {};
+  }
   sudo(pid, call, signal) {
     const caller = {
       cred: this.credOf(pid),