Fix EINTR handling

youknowone · youknowone · commit 2668abf456e8 · 2026-02-23T12:26:46.000+09:00
diff --git a/crates/vm/src/stdlib/io.rs b/crates/vm/src/stdlib/io.rs
@@ -1001,10 +1001,18 @@ mod _io {
         ) -> PyResult<Option<usize>> {
             let len = buf_range.len();
             let res = if let Some(buf) = buf {
-                let mem_obj = PyMemoryView::from_buffer_range(buf, buf_range, vm)?.to_pyobject(vm);
+                let mem_obj =
+                    PyMemoryView::from_buffer_range(buf, buf_range, vm)?.into_ref(&vm.ctx);
 
-                // TODO: loop if write() raises an interrupt
-                vm.call_method(self.raw.as_ref().unwrap(), "write", (mem_obj,))?
+                // Loop if write() raises EINTR (PEP 475)
+                loop {
+                    let res =
+                        vm.call_method(self.raw.as_ref().unwrap(), "write", (mem_obj.clone(),));
+                    match trap_eintr(res, vm)? {
+                        Some(val) => break val,
+                        None => continue,
+                    }
+                }
             } else {
                 let v = core::mem::take(&mut self.buffer);
                 let write_buf = VecBuffer::from(v).into_ref(&vm.ctx);
@@ -1015,8 +1023,16 @@ mod _io {
                 )?
                 .into_ref(&vm.ctx);
 
-                // TODO: loop if write() raises an interrupt
-                let res = vm.call_method(self.raw.as_ref().unwrap(), "write", (mem_obj.clone(),));
+                // Loop if write() raises EINTR (PEP 475)
+                let res = loop {
+                    let res =
+                        vm.call_method(self.raw.as_ref().unwrap(), "write", (mem_obj.clone(),));
+                    match trap_eintr(res, vm) {
+                        Ok(Some(val)) => break Ok(val),
+                        Ok(None) => continue,
+                        Err(e) => break Err(e),
+                    }
+                };
 
                 mem_obj.release();
                 self.buffer = write_buf.take();
@@ -5737,11 +5753,18 @@ mod fileio {
 
             let mut handle = zelf.get_fd(vm)?;
 
-            let len = match obj.with_ref(|b| handle.write(b)) {
-                Ok(n) => n,
-                // Non-blocking mode: return None if EAGAIN
-                Err(e) if e.raw_os_error() == Some(libc::EAGAIN) => return Ok(None),
-                Err(e) => return Err(Self::io_error(zelf, e, vm)),
+            // Loop on EINTR (PEP 475)
+            let len = loop {
+                match obj.with_ref(|b| handle.write(b)) {
+                    Ok(n) => break n,
+                    Err(e) if e.raw_os_error() == Some(libc::EINTR) => {
+                        vm.check_signals()?;
+                        continue;
+                    }
+                    // Non-blocking mode: return None if EAGAIN
+                    Err(e) if e.raw_os_error() == Some(libc::EAGAIN) => return Ok(None),
+                    Err(e) => return Err(Self::io_error(zelf, e, vm)),
+                }
             };
 
             //return number of bytes written
