@ai-ecoverse/slicc-kernel 1.54.1 → 1.54.2

package/dist/node-process-worker.js

@@ -1760,7 +1760,7 @@ function readTermios(mem, ptr) {
     c_cc: Array.from({ length: NCCS }, (_, i) => v.getUint8(ptr + C_CC + i))
   };
 }
-function sliccTty(mem, fds, kernel) {
+function sliccTty(mem, fds, kernel, interrupted = () => void 0) {
   const { sys } = kernel;
   const terminal = (fd) => {
     const e = fds.find(fd);
@@ -1772,13 +1772,19 @@ function sliccTty(mem, fds, kernel) {
     if (value2 === void 0) throw new WasiError("ENOTTY");
     return value2;
   };
+  const getAttr = (fd, ptr) => {
+    interrupted();
+    writeTermios(mem, ptr, needs(sys.tcgets?.(terminal(fd))));
+  };
   const setAttr = (fd, actions, ptr) => {
+    interrupted();
     if (actions < 0 || actions > TCSAFLUSH) throw new WasiError("EINVAL");
     const at = terminal(fd);
     needs(sys.tcsets);
     sys.tcsets?.(at, readTermios(mem, ptr), actions === TCSAFLUSH);
   };
   const size = (fd, ptr) => {
+    interrupted();
     const [rows, cols] = needs(sys.winsize?.(terminal(fd)));
     mem.bytes(ptr, 8).fill(0);
     const v = mem.view();
@@ -1786,7 +1792,7 @@ function sliccTty(mem, fds, kernel) {
     v.setUint16(ptr + 2, cols, true);
   };
   return {
-    tcgetattr: (fd, ptr) => void writeTermios(mem, ptr, needs(sys.tcgets?.(terminal(fd)))),
+    tcgetattr: (fd, ptr) => void getAttr(fd, ptr),
     tcsetattr: (fd, actions, ptr) => void setAttr(fd, actions, ptr),
     winsize: (fd, ptr) => void size(fd, ptr)
   };
@@ -1935,7 +1941,7 @@ var init_wasi_host = __esm({
         if (umask !== DEFAULT_UMASK) this.o.fs.chmod(path, mode & ~umask);
       }
       sliccTtyImports() {
-        return wrap(sliccTty(this.mem, this.fds, this.o.kernel));
+        return wrap(sliccTty(this.mem, this.fds, this.o.kernel, () => this.interrupted?.()));
       }
       sliccFsImports() {
         const { mem, fds } = this;
@@ -2156,6 +2162,7 @@ var init_wasi_host = __esm({
         return {
           path_open: (dirfd, _lookup, p, l, oflags, rights, _inheriting, fdflags, out) => {
             const path = at(dirfd, p, l);
+            if (deviceOf(path)) this.interrupted?.();
             const fresh = (oflags & OFLAGS.CREAT) !== 0 && !o.fs.exists(path);
             mem.view().setUint32(out, fds.open(path, oflags, rights, fdflags), true);
             if (fresh) this.created(path, 438);
@@ -2271,7 +2278,9 @@ var init_wasi_host = __esm({
       }
       positional(fd, access) {
         const e = this.fds.get(fd);
-        if (e.type !== "kernel" || this.fds.kind(fd, e) !== "file") return this.file(fd, access);
+        const kind = e.type === "kernel" ? this.fds.kind(fd, e) : e.type;
+        if (kind === "device") this.interrupted?.();
+        if (kind !== "file" || e.type !== "kernel") return this.file(fd, access);
         const kernel = this.o.kernel;
         return {
           pread: (max, at) => {
@@ -2299,6 +2308,7 @@ var init_wasi_host = __esm({
           }
         }
         if (e.type === "device") {
+          this.interrupted?.();
           if (e.access === "read") throw new WasiError("EBADF");
           if (e.device === "full" && data.length > 0) throw new WasiError("ENOSPC");
           return data.length;
@@ -2311,6 +2321,7 @@ var init_wasi_host = __esm({
           return this.o.kernel.sys.read(fd, Math.min(max, MAX_READ), { nonblock: e.nonblock });
         }
         if (e.type === "device") {
+          this.interrupted?.();
           if (e.access === "write") throw new WasiError("EBADF");
           if (e.device === "null") return new Uint8Array(0);
           const out = new Uint8Array(Math.min(max, 65536));
@@ -2318,15 +2329,19 @@ var init_wasi_host = __esm({
         }
         return this.file(fd, "read").read(max);
       }
+      local(answer2) {
+        this.interrupted?.();
+        return answer2;
+      }
       seek(fd, offset, whence) {
         const e = this.fds.get(fd);
         if (e.type === "kernel") {
           const kind = this.fds.kind(fd, e);
-          if (kind === "device") return 0;
+          if (kind === "device") return this.local(0);
           if (kind !== "file") throw new WasiError("ESPIPE");
           return this.o.kernel.sys.seek(fd, offset, whence);
         }
-        if (e.type === "device") return 0;
+        if (e.type === "device") return this.local(0);
         const file = this.file(fd);
         const base = whence === WHENCE.SET ? 0 : whence === WHENCE.CUR ? file.offset : file.size();
         if (whence > WHENCE.END || base + offset < 0) throw new WasiError("EINVAL");
@@ -2336,15 +2351,23 @@ var init_wasi_host = __esm({
       sync(fd) {
         const e = this.fds.get(fd);
         if (e.type === "file") e.file.flush();
-        else if (e.type === "kernel" && this.fds.kind(fd, e) === "file") this.o.kernel.sys.flush(fd);
+        else if (e.type === "device") this.interrupted?.();
+        else if (e.type === "kernel") {
+          const kind = this.fds.kind(fd, e);
+          if (kind === "file") this.o.kernel.sys.flush(fd);
+          else if (kind === "device") this.interrupted?.();
+        }
       }
       fdstat(fd, out) {
         const e = this.fds.get(fd);
+        if (e.type === "device") this.interrupted?.();
         let filetype = FILETYPE.CHARACTER_DEVICE;
         let seeks = true;
         let flags = 0;
         if (e.type === "kernel") {
-          ({ filetype, seeks } = kernelFiletype(this.fds.kind(fd, e)));
+          const kind = this.fds.kind(fd, e);
+          if (kind === "device") this.interrupted?.();
+          ({ filetype, seeks } = kernelFiletype(kind));
           if (e.nonblock) flags |= FDFLAGS.NONBLOCK;
           if (e.append) flags |= FDFLAGS.APPEND;
         } else if (e.type === "file") {
@@ -2379,7 +2402,7 @@ var init_wasi_host = __esm({
           if (vfs.path) return this.statOrphanable(vfs.path, vfs.size, vfs.orphan);
         }
         const filetype = kind ? kernelFiletype(kind).filetype : FILETYPE.CHARACTER_DEVICE;
-        return { filetype, size: 0n, ino: BigInt(fd + 1), mtimeNs: 0n };
+        return this.local({ filetype, size: 0n, ino: BigInt(fd + 1), mtimeNs: 0n });
       }
       statOrphanable(path, size, orphan = false) {
         let s;
@@ -2396,7 +2419,12 @@ var init_wasi_host = __esm({
       }
       pathFilestat(path, lookup) {
         if (deviceOf(path)) {
-          return { filetype: FILETYPE.CHARACTER_DEVICE, size: 0n, ino: pathInode(path), mtimeNs: 0n };
+          return this.local({
+            filetype: FILETYPE.CHARACTER_DEVICE,
+            size: 0n,
+            ino: pathInode(path),
+            mtimeNs: 0n
+          });
         }
         this.fds.flushPath(path);
         const follow2 = (lookup & LOOKUP_SYMLINK_FOLLOW) !== 0;
@@ -7560,6 +7588,7 @@ var init_process_signals = __esm({
         }
       }
       interrupt() {
+        this.report();
         const header = this.header;
         const pending = Atomics.load(header, SAB_I_SIGNALS) | Atomics.load(header, SAB_I_TIMERS) | Atomics.load(header, SAB_I_KILLED);
         if (pending === 0) return false;
@@ -10675,6 +10704,7 @@ var init_wasix_host = __esm({
       }
       ttyGet(ptr) {
         const { host, mem } = this;
+        host.interrupted?.();
         const v = mem.view();
         mem.bytes(ptr, 24).fill(0);
         const fd = this.ttyFd();
@@ -10694,6 +10724,7 @@ var init_wasix_host = __esm({
         v.setUint8(ptr + 20, termios && termios.c_lflag & ICANON2 ? 1 : 0);
       }
       ttySet(ptr) {
+        this.host.interrupted?.();
         const fd = this.ttyFd();
         if (fd === void 0) throw new WasiError("ENOTTY");
         const { sys } = this.host.o.kernel;