Merge #798

798: channel: Do not panic on very large timeout r=taiki-e a=taiki-e

Fixes #795

Co-authored-by: Taiki Endo <[email protected]>

Author: bors[bot]

crossbeam-channel/src/channel.rs

@@ -14,6 +14,7 @@ use crate::err::{
 };
 use crate::flavors;
 use crate::select::{Operation, SelectHandle, Token};
+use crate::utils;
 
 /// Creates a channel of unbounded capacity.
 ///
@@ -471,7 +472,7 @@ impl<T> Sender<T> {
     /// );
     /// ```
     pub fn send_timeout(&self, msg: T, timeout: Duration) -> Result<(), SendTimeoutError<T>> {
-        self.send_deadline(msg, Instant::now() + timeout)
+        self.send_deadline(msg, utils::convert_timeout_to_deadline(timeout))
     }
 
     /// Waits for a message to be sent into the channel, but only until a given deadline.
@@ -861,7 +862,7 @@ impl<T> Receiver<T> {
     /// );
     /// ```
     pub fn recv_timeout(&self, timeout: Duration) -> Result<T, RecvTimeoutError> {
-        self.recv_deadline(Instant::now() + timeout)
+        self.recv_deadline(utils::convert_timeout_to_deadline(timeout))
     }
 
     /// Waits for a message to be received from the channel, but only before a given deadline.

crossbeam-channel/src/flavors/at.rs

@@ -35,7 +35,7 @@ impl Channel {
     /// Creates a channel that delivers a message after a certain duration of time.
     #[inline]
     pub(crate) fn new_timeout(dur: Duration) -> Self {
-        Self::new_deadline(Instant::now() + dur)
+        Self::new_deadline(utils::convert_timeout_to_deadline(dur))
     }
 
     /// Attempts to receive a message without blocking.

crossbeam-channel/src/flavors/tick.rs

@@ -10,6 +10,7 @@ use crossbeam_utils::atomic::AtomicCell;
 use crate::context::Context;
 use crate::err::{RecvTimeoutError, TryRecvError};
 use crate::select::{Operation, SelectHandle, Token};
+use crate::utils;
 
 /// Result of a receive operation.
 pub(crate) type TickToken = Option<Instant>;
@@ -28,7 +29,7 @@ impl Channel {
     #[inline]
     pub(crate) fn new(dur: Duration) -> Self {
         Channel {
-            delivery_time: AtomicCell::new(Instant::now() + dur),
+            delivery_time: AtomicCell::new(utils::convert_timeout_to_deadline(dur)),
             duration: dur,
         }
     }

crossbeam-channel/src/select.rs

@@ -487,7 +487,7 @@ pub fn select_timeout<'a>(
     handles: &mut [(&'a dyn SelectHandle, usize, *const u8)],
     timeout: Duration,
 ) -> Result<SelectedOperation<'a>, SelectTimeoutError> {
-    select_deadline(handles, Instant::now() + timeout)
+    select_deadline(handles, utils::convert_timeout_to_deadline(timeout))
 }
 
 /// Blocks until a given deadline, or until one of the operations becomes ready and selects it.
@@ -1043,7 +1043,7 @@ impl<'a> Select<'a> {
     /// }
     /// ```
     pub fn ready_timeout(&mut self, timeout: Duration) -> Result<usize, ReadyTimeoutError> {
-        self.ready_deadline(Instant::now() + timeout)
+        self.ready_deadline(utils::convert_timeout_to_deadline(timeout))
     }
 
     /// Blocks until a given deadline, or until one of the operations becomes ready.

crossbeam-channel/src/utils.rs

@@ -61,6 +61,14 @@ pub(crate) fn sleep_until(deadline: Option<Instant>) {
     }
 }
 
+// https://github.com/crossbeam-rs/crossbeam/issues/795
+pub(crate) fn convert_timeout_to_deadline(timeout: Duration) -> Instant {
+    match Instant::now().checked_add(timeout) {
+        Some(deadline) => deadline,
+        None => Instant::now() + Duration::from_secs(86400 * 365 * 30),
+    }
+}
+
 /// A simple spinlock.
 pub(crate) struct Spinlock<T> {
     flag: AtomicBool,