more default sleep_until implementations

Author: dvdsk

library/std/src/sys/pal/hermit/thread.rs

@@ -90,7 +90,7 @@ impl Thread {
         let now = Instant::now();
 
         if let Some(delay) = deadline.checked_duration_since(now) {
-            sleep(delay);
+            Self::sleep(delay);
         }
     }
 

library/std/src/sys/pal/itron/thread.rs

@@ -10,7 +10,7 @@ use crate::mem::ManuallyDrop;
 use crate::num::NonZero;
 use crate::ptr::NonNull;
 use crate::sync::atomic::{Atomic, AtomicUsize, Ordering};
-use crate::time::Duration;
+use crate::time::{Duration, Instant};
 use crate::{hint, io};
 
 pub struct Thread {
@@ -209,7 +209,7 @@ impl Thread {
         let now = Instant::now();
 
         if let Some(delay) = deadline.checked_duration_since(now) {
-            sleep(delay);
+            Self::sleep(delay);
         }
     }
 

library/std/src/sys/pal/sgx/thread.rs

@@ -136,7 +136,7 @@ impl Thread {
         let now = Instant::now();
 
         if let Some(delay) = deadline.checked_duration_since(now) {
-            sleep(delay);
+            Self::sleep(delay);
         }
     }
 

library/std/src/sys/pal/uefi/thread.rs

@@ -43,7 +43,7 @@ impl Thread {
         let now = Instant::now();
 
         if let Some(delay) = deadline.checked_duration_since(now) {
-            sleep(delay);
+            Self::sleep(delay);
         }
     }
 

library/std/src/sys/pal/unix/thread.rs

@@ -6,7 +6,7 @@ use crate::sys::weak::dlsym;
 #[cfg(any(target_os = "solaris", target_os = "illumos", target_os = "nto",))]
 use crate::sys::weak::weak;
 use crate::sys::{os, stack_overflow};
-use crate::time::Duration;
+use crate::time::{Duration, Instant};
 use crate::{cmp, io, ptr};
 #[cfg(not(any(
     target_os = "l4re",
@@ -296,27 +296,7 @@ impl Thread {
         }
     }
 
-    #[cfg(not(any(
-        target_os = "freebsd",
-        target_os = "netbsd",
-        target_os = "linux",
-        target_os = "android",
-        target_os = "solaris",
-        target_os = "illumos",
-        target_os = "dragonfly",
-        target_os = "hurd",
-        target_os = "fuchsia",
-        target_os = "vxworks",
-    )))]
-    pub fn sleep_until(deadline: Instant) {
-        let now = Instant::now();
-
-        if let Some(delay) = deadline.checked_duration_since(now) {
-            sleep(delay);
-        }
-    }
-
-    // Note depends on clock_nanosleep (not supported on os's by apple)
+    // Any unix that has clock_nanosleep
     #[cfg(any(
         target_os = "freebsd",
         target_os = "netbsd",
@@ -329,7 +309,7 @@ impl Thread {
         target_os = "fuchsia",
         target_os = "vxworks",
     ))]
-    pub fn sleep_until(deadline: crate::time::Instant) {
+    pub fn sleep_until(deadline: Instant) {
         let mut ts = deadline
             .into_inner()
             .into_timespec()
@@ -352,6 +332,27 @@ impl Thread {
         }
     }
 
+    // Any unix that does not have clock_nanosleep
+    #[cfg(not(any(
+        target_os = "freebsd",
+        target_os = "netbsd",
+        target_os = "linux",
+        target_os = "android",
+        target_os = "solaris",
+        target_os = "illumos",
+        target_os = "dragonfly",
+        target_os = "hurd",
+        target_os = "fuchsia",
+        target_os = "vxworks",
+    )))]
+    pub fn sleep_until(deadline: Instant) {
+        let now = Instant::now();
+
+        if let Some(delay) = deadline.checked_duration_since(now) {
+            Self::sleep(delay);
+        }
+    }
+
     pub fn join(self) {
         let id = self.into_id();
         let ret = unsafe { libc::pthread_join(id, ptr::null_mut()) };

library/std/src/sys/pal/unsupported/thread.rs

@@ -26,6 +26,10 @@ impl Thread {
         panic!("can't sleep");
     }
 
+    pub fn sleep_until(_deadline: Instant) {
+        panic!("can't sleep");
+    }
+
     pub fn join(self) {
         self.0
     }

library/std/src/sys/pal/wasi/thread.rs

@@ -2,7 +2,7 @@
 
 use crate::ffi::CStr;
 use crate::num::NonZero;
-use crate::time::Duration;
+use crate::time::{Duration, Instant};
 use crate::{io, mem};
 
 cfg_if::cfg_if! {
@@ -175,7 +175,7 @@ impl Thread {
         let now = Instant::now();
 
         if let Some(delay) = deadline.checked_duration_since(now) {
-            sleep(delay);
+            Self::sleep(delay);
         }
     }
 

library/std/src/sys/pal/wasm/atomics/thread.rs

@@ -2,7 +2,7 @@ use crate::ffi::CStr;
 use crate::io;
 use crate::num::NonZero;
 use crate::sys::unsupported;
-use crate::time::Duration;
+use crate::time::{Duration, Instant};
 
 pub struct Thread(!);
 
@@ -41,6 +41,14 @@ impl Thread {
         }
     }
 
+    pub fn sleep_until(deadline: Instant) {
+        let now = Instant::now();
+
+        if let Some(delay) = deadline.checked_duration_since(now) {
+            Self::sleep(delay);
+        }
+    }
+
     pub fn join(self) {}
 }
 

library/std/src/sys/pal/xous/thread.rs

@@ -8,7 +8,7 @@ use crate::os::xous::ffi::{
     map_memory, update_memory_flags,
 };
 use crate::os::xous::services::{TicktimerScalar, ticktimer_server};
-use crate::time::Duration;
+use crate::time::{Duration, Instant};
 
 pub struct Thread {
     tid: ThreadId,
@@ -132,7 +132,7 @@ impl Thread {
         let now = Instant::now();
 
         if let Some(delay) = deadline.checked_duration_since(now) {
-            sleep(delay);
+            Self::sleep(delay);
         }
     }