@ai-ecoverse/slicc-kernel 1.99.2 → 1.100.1

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.99.2" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.100.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
@@ -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);
@@ -12140,7 +12182,7 @@ async function recordLock2(req, ctx) {
     return done2;
   }
   const range = lockRange(req.start, req.len);
-  const key = await fileKey(target, req.kind);
+  const key = await fileKey(target, req.kind, req.op === "lk-set" && req.fd !== void 0);
   if (req.op === "lk-get") {
     const held = locks.holder(key, owner, { key, kind: req.kind, ...range });
     if (!held) return json3(null);
@@ -15624,7 +15666,7 @@ var WasmProcess = class {
         return await hostSyscall(req, {
           pid: this.pid,
           owner: () => this.lockOwner(),
-          fileKey: (target, kind) => this.lockKey(target, kind),
+          fileKey: (target, kind, setting) => this.lockKey(target, kind, setting),
           locks: this.options.locks,
           ops: this.asyncOps,
           blocking: () => this.blockingSignal(cancelled),
@@ -15676,8 +15718,11 @@ var WasmProcess = class {
     }
     return path;
   }
-  async lockKey(target, kind) {
+  async lockKey(target, kind, setting = false) {
     const file = target.fd === void 0 ? void 0 : this.fds.get(target.fd);
+    const access2 = file?.file;
+    if (setting && (kind === "read" && !access2?.read || kind === "write" && !access2?.write))
+      throw new KernelError("EBADF");
     const known = file ? fileKeys.get(file) : this.pathKeys.get(target.path ?? "");
     if (kind === "close" && !file && target.path !== void 0) this.pathKeys.delete(target.path);
     const want = kind === "read" ? R_OK : kind === "write" ? W_OK : 0;
@@ -17042,8 +17087,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()
   };
 }
 
@@ -21565,6 +21616,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),
@@ -21576,6 +21628,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),