@ai-ecoverse/slicc-kernel 1.100.1 → 1.100.3

package/dist/node-process-worker.js

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

package/dist/node.js

@@ -11107,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.1" : "0.0.0-dev";
+var KERNEL_VERSION = true ? "1.100.3" : "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
@@ -14246,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",
@@ -14432,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();
     }
@@ -15456,6 +15464,10 @@ function identityKey(st, path) {
 }
 var DYING = { ok: false, errno: "EINTR", message: "the process is being killed" };
 var HOSTS_ONLY = new Resolver({ routes: new Routes() });
+function timeLeft2(req, started) {
+  if (!("timeoutMs" in req) || typeof req.timeoutMs !== "number" || req.timeoutMs < 0) return req;
+  return { ...req, timeoutMs: Math.max(0, req.timeoutMs - (performance.now() - started)) };
+}
 var WasmProcess = class {
   exited = false;
   children;
@@ -15616,22 +15628,28 @@ var WasmProcess = class {
   blocks = /* @__PURE__ */ new WeakMap();
   async syscall(req, cancelled, block) {
     this.options.onSyscall?.(req);
+    const started = performance.now();
+    let restarted = false;
     for (; ; ) {
       await this.resumed;
       if (this.dying) return DYING;
+      const current = restarted ? timeLeft2(req, started) : req;
       const stops = this.stops;
       const scope = new AbortController();
       const forward = () => scope.abort();
       if (cancelled?.aborted) scope.abort();
       cancelled?.addEventListener("abort", forward, { once: true });
       if (block) this.blocks.set(scope.signal, block);
-      const result = await this.dispatch(req, scope.signal).finally(() => {
+      const result = await this.dispatch(current, scope.signal).finally(() => {
         cancelled?.removeEventListener("abort", forward);
         this.waiting.delete(scope.signal);
       });
       if (this.dying) return DYING;
       const restart = !result.ok && result.errno === "EINTR" && this.stops !== stops;
-      if (restart && !this.options.hasPending?.()) continue;
+      if (restart && !this.options.hasPending?.() && req.op !== "epoll-wait") {
+        restarted = true;
+        continue;
+      }
       await this.resumed;
       return result;
     }