-
Notifications
You must be signed in to change notification settings - Fork 341
Add io::timeout() #19
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 1 commit
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
use std::pin::Pin; | ||
use std::time::Duration; | ||
|
||
use futures_timer::Delay; | ||
use pin_utils::unsafe_pinned; | ||
|
||
use crate::future::Future; | ||
use crate::io; | ||
use crate::task::{Context, Poll}; | ||
|
||
/// Awaits an I/O future or times out after a duration of time. | ||
/// | ||
/// # Examples | ||
/// | ||
/// ```no_run | ||
/// # #![feature(async_await)] | ||
/// # fn main() -> std::io::Result<()> { async_std::task::block_on(async { | ||
/// # | ||
/// use std::time::Duration; | ||
/// | ||
/// use async_std::io; | ||
/// | ||
/// let stdin = io::stdin(); | ||
/// let mut line = String::new(); | ||
/// | ||
/// let dur = Duration::from_secs(5); | ||
/// let n = io::timeout(dur, stdin.read_line(&mut line)).await?; | ||
/// # | ||
/// # Ok(()) }) } | ||
/// ``` | ||
pub async fn timeout<F, T>(dur: Duration, f: F) -> io::Result<T> | ||
where | ||
F: Future<Output = io::Result<T>>, | ||
{ | ||
let f = TimeoutFuture { | ||
future: f, | ||
delay: Delay::new(dur), | ||
}; | ||
f.await | ||
} | ||
|
||
struct TimeoutFuture<F> { | ||
future: F, | ||
delay: Delay, | ||
} | ||
|
||
impl<F> TimeoutFuture<F> { | ||
unsafe_pinned!(future: F); | ||
unsafe_pinned!(delay: Delay); | ||
} | ||
|
||
impl<F, T> Future for TimeoutFuture<F> | ||
where | ||
F: Future<Output = io::Result<T>>, | ||
{ | ||
type Output = F::Output; | ||
|
||
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> { | ||
match self.as_mut().future().poll(cx) { | ||
Poll::Ready(v) => Poll::Ready(v), | ||
Poll::Pending => match self.delay().poll(cx) { | ||
Poll::Ready(_) => Poll::Ready(Err(io::Error::new( | ||
io::ErrorKind::TimedOut, | ||
"future has timed out", | ||
yoshuawuyts marked this conversation as resolved.
Show resolved
Hide resolved
|
||
))), | ||
Poll::Pending => Poll::Pending, | ||
}, | ||
} | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I might flip these lines around: create the future above the thing, and then write the timeout in the same line. I feel the statements "we're writing a timeout" immediately raises the question "for how long", and that should be the same line.
This kind of reopens the question of argument ordering for me again; but we should probably keep giving this a spin.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Which one among these do you prefer?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Style 2, but the ordering looks weird to me (might be Stockholm syndrome) so I'm almost thinking we should flip the ordering:
Lines up with "timeout
fut
after5 secs
. Wait until it's done."There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@skade do you have an opinion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm still for the original ordering, as it makes async block easier. I have also absolutely no problem with things that don't follow sentence structure ;).
Style 2 would be my preference.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@yoshuawuyts Check this out:
Perhaps we should also think about whether timeouts are typically applied to individual futures/async operations or to whole requests/tasks/procedures/contexts...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think both.