@ai-ecoverse/slicc-kernel 1.137.0 → 1.138.1

package/dist/node-process-worker.js

@@ -25,11 +25,7 @@ function chain(target) {
 function hide(target, names) {
   for (const name2 of names) {
     const holders = chain(target);
-    for (const holder of holders) {
-      if (Object.getOwnPropertyDescriptor(holder, name2)?.configurable) {
-        Reflect.deleteProperty(holder, name2);
-      }
-    }
+    for (const holder of holders) Reflect.deleteProperty(holder, name2);
     const kept = holders.slice(1).some((holder) => Object.hasOwn(holder, name2));
     const defined = Reflect.defineProperty(target, name2, {
       value: void 0,
@@ -45,11 +41,7 @@ function hide(target, names) {
 function vacate(target, names) {
   for (const name2 of names) {
     const holders = chain(target);
-    for (const holder of holders) {
-      if (Object.getOwnPropertyDescriptor(holder, name2)?.configurable) {
-        Reflect.deleteProperty(holder, name2);
-      }
-    }
+    for (const holder of holders) Reflect.deleteProperty(holder, name2);
     const kept = holders.slice(1).some((holder) => Object.hasOwn(holder, name2));
     const opened2 = Reflect.defineProperty(target, name2, {
       value: void 0,
@@ -4059,12 +4051,16 @@ function readyEvents(subs, ready) {
     ...nbytesOf(s, ready)
   }));
 }
-function selectOnce(deps, read2, write2, timeoutMs2) {
+function selectOnce(deps, read2, write2, timeoutMs2, mayResume) {
   try {
     const ready = deps.kernel.call({ op: "fd-select", read: read2, write: write2, timeoutMs: timeoutMs2 });
     return { ready, interrupted: false };
   } catch (e) {
-    if (!deps.interruptWakes || e.code !== "EINTR") throw e;
+    if (e.code !== "EINTR") throw e;
+    if (!deps.interruptWakes && mayResume && deps.resumes?.()) {
+      return { ready: { read: [], write: [] }, interrupted: false, resumed: true };
+    }
+    if (!deps.interruptWakes) throw e;
     return { ready: { read: [], write: [] }, interrupted: true };
   }
 }
@@ -4074,8 +4070,15 @@ function waitEvents(deps, subs, { events, read: read2, write: write2 }, entered)
     if (events.length > 0 || entered) return 0;
     return earliest === Infinity ? -1 : Math.max(0, Math.ceil(earliest - performance.now()));
   };
-  for (; ; ) {
-    const { ready, interrupted } = selectOnce(deps, read2, write2, timeout());
+  for (let resumes = 0; ; ) {
+    const { ready, interrupted, resumed } = selectOnce(
+      deps,
+      read2,
+      write2,
+      timeout(),
+      resumes++ < RESUMES
+    );
+    if (resumed) continue;
     events.push(...readyEvents(subs, ready));
     if (interrupted) return true;
     if (events.length > 0 || entered || earliest === Infinity) return false;
@@ -4102,10 +4105,12 @@ function pollOneoff(deps, inPtr, outPtr, nsubs, neventsPtr) {
   mem.view().setUint32(neventsPtr, events.length, true);
   return E.SUCCESS;
 }
+var RESUMES;
 var init_wasi_poll = __esm({
   "src/process/wasi/wasi-poll.ts"() {
     "use strict";
     init_wasi_abi();
+    RESUMES = 64;
   }
 });
 
@@ -5348,7 +5353,8 @@ var init_wasi_host = __esm({
           }
         });
       }
-      poll(inPtr, outPtr, n, nevents) {
+      poll(inPtr, outPtr, n, nevents, resume = true) {
+        const ran = this.signals?.ran ?? 0;
         try {
           return pollOneoff(
             {
@@ -5357,7 +5363,8 @@ var init_wasi_host = __esm({
               kernel: this.o.kernel,
               now: (id) => this.now(id),
               interruptWakes: this.interruptWakes,
-              entered: this.entered
+              entered: this.entered,
+              ...resume ? { resumes: () => this.resumesPoll(ran) } : {}
             },
             inPtr,
             outPtr,
@@ -5368,13 +5375,17 @@ var init_wasi_host = __esm({
           this.o.fs.invalidate?.();
         }
       }
+      resumesPoll(ran) {
+        this.interrupted?.();
+        return (this.signals?.ran ?? 0) === ran;
+      }
       maskedPoll(mask, set, [inPtr, outPtr, n, nevents]) {
         const old = mask.swap(set[0], set[1]);
         try {
           this.mem.view().setUint32(nevents, 0, true);
           if (mask.deliverUnblocked()) return E.INTR;
           this.settleEntry(mask);
-          if (n > 0) return this.poll(inPtr, outPtr, n, nevents);
+          if (n > 0) return this.poll(inPtr, outPtr, n, nevents, false);
           return this.entered ? E.INTR : this.suspend();
         } finally {
           mask.deliverUnblocked();
@@ -6699,7 +6710,7 @@ var KERNEL_VERSION, OS_RELEASE;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    KERNEL_VERSION = true ? "1.137.0" : "0.0.0-dev";
+    KERNEL_VERSION = true ? "1.138.1" : "0.0.0-dev";
     OS_RELEASE = "6.0.0-slicc";
   }
 });
@@ -16028,7 +16039,9 @@ var init_wasi_signals = __esm({
         this.deferred &= ~bit;
         this.raise(sig);
       }
+      ran = 0;
       run(handler, sig) {
+        this.ran++;
         const outer = { sig: this.delivering, defaulted: this.defaulted, libc: this.libcDefault };
         this.delivering = sig;
         this.defaulted = false;