@ai-ecoverse/slicc-kernel 1.76.0 → 1.77.0

package/dist/process-worker.js

@@ -195,6 +195,8 @@ function slots(sab) {
 function useLocalClock(sab) {
   local = sab && sab.byteLength >= LOCAL + SAB_CLOCK_I64 * 8 ? slots(sab) : void 0;
   if (!local) return;
+  localSab = sab;
+  localStart = epochMicros();
   const wait2 = (typed, index3, value2, timeout) => localWait(() => rawWait(typed, index3, value2, timeout));
   Atomics.wait = wait2;
 }
@@ -211,13 +213,26 @@ function localWait(wait2) {
     Atomics.store(clock, IDLE, idle + (end > start2 ? end - start2 : 0n));
   }
 }
-var LOCAL, IDLE, local, rawWait;
+function localCpuNanos() {
+  if (!local || !localSab) return void 0;
+  const now = epochMicros();
+  const blocked = Number(Atomics.load(local, BLOCKED)) + localIdle(localSab, now).idle;
+  return BigInt(Math.max(0, now - localStart - blocked)) * 1000n;
+}
+function localIdle(sab, now) {
+  const state = Number(Atomics.load(slots(sab), IDLE));
+  if (state >= 0) return { idle: state, waiting: false };
+  return { idle: Math.max(0, now + state), waiting: true };
+}
+var LOCAL, BLOCKED, IDLE, local, localSab, localStart, rawWait;
 var init_cpu_clock = __esm({
   "src/kernel/cpu-clock.ts"() {
     "use strict";
     init_sync_sab_wire();
     LOCAL = SAB_CLOCK_OFFSET;
+    BLOCKED = 0;
     IDLE = 1;
+    localStart = 0;
     rawWait = Atomics.wait.bind(Atomics);
   }
 });
@@ -3250,7 +3265,10 @@ var init_process_fds = __esm({
       faccessat: "__syscall_faccessat",
       utimensat: "__syscall_utimensat",
       getppid: "slicc_getppid_js",
-      resizeHeap: "emscripten_resize_heap"
+      resizeHeap: "emscripten_resize_heap",
+      fdWrite: "fd_write",
+      fdRead: "fd_read",
+      sleepMs: "slicc_sleep_ms"
     };
     UTIME_NOW = 1073741823;
     UTIME_OMIT = 1073741822;
@@ -4109,8 +4127,8 @@ function pidStat(info, boot) {
     0,
     ticks(info.utime ?? 0),
     ticks(info.stime ?? 0),
-    0,
-    0,
+    ticks(info.cutime ?? 0),
+    ticks(info.cstime ?? 0),
     20,
     0,
     1,
@@ -4134,7 +4152,7 @@ function pidStat(info, boot) {
 `;
 }
 function pidStatus(info) {
-  const state = info.state === "Z" ? "Z (zombie)" : "S (sleeping)";
+  const state = STATES[info.state];
   const c = info.cred ?? ROOT;
   const ids = (r, e, s) => `${r}	${e}	${s}	${e}`;
   return [
@@ -4410,7 +4428,7 @@ function useProcfs(Fs, sys, pid, memory = memorySource()) {
     readdir: (node) => pidNames(selfReaddir ? selfReaddir(node) : [".", ".."])
   };
 }
-var HZ, DIR_MODE2, FILE_MODE, LINK_MODE2, ENOENT, EINVAL, UID, KIB, FALLBACK_MEMORY, PID_FILES, SYSTEM_FILES, sigMask;
+var HZ, DIR_MODE2, FILE_MODE, LINK_MODE2, ENOENT, EINVAL, UID, KIB, FALLBACK_MEMORY, PID_FILES, SYSTEM_FILES, sigMask, STATES;
 var init_procfs = __esm({
   "src/process/procfs.ts"() {
     "use strict";
@@ -4428,6 +4446,7 @@ var init_procfs = __esm({
     PID_FILES = ["cmdline", "comm", "stat", "statm", "status"];
     SYSTEM_FILES = ["loadavg", "meminfo", "stat", "uptime"];
     sigMask = (mask = 0) => (mask >>> 1).toString(16).padStart(16, "0");
+    STATES = { S: "S (sleeping)", T: "T (stopped)", Z: "Z (zombie)" };
   }
 });
 
@@ -4673,6 +4692,19 @@ function reportGrowth(imports, publish, glue) {
     return grown;
   });
 }
+function holdWhileStopped(imports, header, glue) {
+  const hold = () => {
+    while (Atomics.load(header, SAB_I_STOP) === 1) Atomics.wait(header, SAB_I_STOP, 1);
+  };
+  for (const name2 of ["fdWrite", "fdRead", "sleepMs"]) {
+    wrapImport(imports, name2, glue, (original) => (...args) => {
+      hold();
+      const done = original(...args);
+      hold();
+      return done;
+    });
+  }
+}
 function callerOwner(Fs, init) {
   return init.owners ? {} : { owner: ownByCaller(Fs, init.cred, credAbi(init.program.glue)) };
 }
@@ -4697,6 +4729,7 @@ function kernelWrappers(imports, module, deps) {
   positionalIo(imports, { glue, fs: fsOf, sys, memory });
   const grown = () => publishMemory(init.sab, memory()?.buffer.byteLength ?? 0);
   reportGrowth(imports, grown, kernelGlue);
+  holdWhileStopped(imports, new Int32Array(init.sab, 0, SAB_HEADER_I32), kernelGlue);
 }
 async function runWasmProcess(init, port2, deps = {}) {
   const signals = new SignalGate(
@@ -4988,6 +5021,9 @@ var init_process_runtime = __esm({
       "  utimensat: typeof ___syscall_utimensat === 'function' ? ___syscall_utimensat : undefined,",
       "  getppid: typeof _slicc_getppid_js === 'function' ? _slicc_getppid_js : undefined,",
       "  resizeHeap: typeof _emscripten_resize_heap === 'function' ? _emscripten_resize_heap : undefined,",
+      "  fdWrite: typeof _fd_write === 'function' ? _fd_write : undefined,",
+      "  fdRead: typeof _fd_read === 'function' ? _fd_read : undefined,",
+      "  sleepMs: typeof slicc_sleep_ms === 'function' ? slicc_sleep_ms : undefined,",
       "};",
       "Module.sliccFdImports ??= {",
       "  fd_sync: typeof _fd_sync === 'function' ? _fd_sync : undefined,",
@@ -6729,6 +6765,7 @@ var init_wasi_host = __esm({
   "src/process/wasi/wasi-host.ts"() {
     "use strict";
     init_physical_path();
+    init_cpu_clock();
     init_cred();
     init_wasi_abi();
     init_wasi_fds();
@@ -6992,7 +7029,7 @@ var init_wasi_host = __esm({
         if (id === CLOCK.MONOTONIC) {
           return MONOTONIC_BASE + BigInt(Math.round(performance.now() * 1e6));
         }
-        return BigInt(Math.round((performance.now() - this.started) * 1e6)) + 1n;
+        return (localCpuNanos() ?? BigInt(Math.round((performance.now() - this.started) * 1e6))) + 1n;
       }
       environ() {
         const listen2 = this.listening.length > 0 ? { SLICC_LISTEN_FDS: this.listening.join(" ") } : {};