time: merge platform-specific sleep implementations

ever0de · ever0de · commit 72d612c3ee41 · 2025-07-07T00:05:03.000+09:00
diff --git a/vm/src/stdlib/time.rs b/vm/src/stdlib/time.rs
@@ -34,7 +34,7 @@ unsafe extern "C" {
 #[pymodule(name = "time", with(platform))]
 mod decl {
     use crate::{
-        PyObjectRef, PyResult, TryFromObject, VirtualMachine,
+        PyObjectRef, PyResult, TryFromObject, VirtualMachine, AsObject,
         builtins::{PyStrRef, PyTypeRef},
         function::{Either, FuncArgs, OptionalArg},
         types::PyStructSequence,
@@ -88,7 +88,6 @@ mod decl {
         duration_since_system_now(vm)
     }
 
-    #[cfg(not(unix))]
     #[pyfunction]
     fn sleep(seconds: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
         let dur = seconds.try_into_value::<Duration>(vm).map_err(|e| {
@@ -102,7 +101,23 @@ mod decl {
             e
         })?;
 
-        std::thread::sleep(dur);
+        #[cfg(unix)]
+        {
+            // this is basically std::thread::sleep, but that catches interrupts and we don't want to;
+            let ts = nix::sys::time::TimeSpec::from(dur);
+            let res = unsafe { libc::nanosleep(ts.as_ref(), std::ptr::null_mut()) };
+            let interrupted = res == -1 && nix::Error::last_raw() == libc::EINTR;
+
+            if interrupted {
+                vm.check_signals()?;
+            }
+        }
+
+        #[cfg(not(unix))]
+        {
+            std::thread::sleep(dur);
+        }
+
         Ok(())
     }
 
@@ -702,30 +717,6 @@ mod platform {
         get_clock_time(ClockId::CLOCK_MONOTONIC, vm)
     }
 
-    #[pyfunction]
-    fn sleep(seconds: PyObjectRef, vm: &VirtualMachine) -> PyResult<()> {
-        let dur = seconds.try_into_value::<Duration>(vm).map_err(|e| {
-            if e.class().is(vm.ctx.exceptions.value_error) {
-                if let Some(s) = e.args().first().and_then(|arg| arg.str(vm).ok()) {
-                    if s.as_str() == "negative duration" {
-                        return vm.new_value_error("sleep length must be non-negative");
-                    }
-                }
-            }
-            e
-        })?;
-
-        let ts = TimeSpec::from(dur);
-        let res = unsafe { libc::nanosleep(ts.as_ref(), std::ptr::null_mut()) };
-        let interrupted = res == -1 && nix::Error::last_raw() == libc::EINTR;
-
-        if interrupted {
-            vm.check_signals()?;
-        }
-
-        Ok(())
-    }
-
     #[cfg(not(any(
         target_os = "illumos",
         target_os = "netbsd",
