mirror/async-std
2
0
Fork 1
mirror of https://github.com/async-rs/async-std.git synced 2025-03-26 19:24:48 +00:00
Code Issues Releases Wiki Activity

Reimplemented throttle to never drop Delay, added boolean flag

Browse source
This commit is contained in:
Wouter Geraedts 2019-11-12 15:07:20 +01:00
parent 77a1849303
commit 6990c1403f
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/stream/stream/throttle.rs
View file

@ -1,6 +1,6 @@
use std::future::Future; use std::future::Future;
use std::pin::Pin; use std::pin::Pin;
use std::time::Duration; use std::time::{Duration, Instant};
use futures_timer::Delay; use futures_timer::Delay;
use pin_project_lite::pin_project; use pin_project_lite::pin_project;
@ -23,7 +23,9 @@ pin_project! {
stream: S, stream: S,
duration: Duration, duration: Duration,
#[pin] #[pin]
delay: Option<Delay>, blocked: bool,
#[pin]
delay: Delay,
} }
} }
@ -32,7 +34,8 @@ impl<S: Stream> Throttle<S> {
Throttle { Throttle {
stream, stream,
duration, duration,
delay: None, blocked: false,
delay: Delay::new(Duration::default()),
} }
} }
} }
@ -42,9 +45,10 @@ impl<S: Stream> Stream for Throttle<S> {
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<S::Item>> { fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<S::Item>> {
let mut this = self.project(); let mut this = self.project();
if let Some(d) = this.delay.as_mut().as_pin_mut() { if *this.blocked {
let d = this.delay.as_mut();
if d.poll(cx).is_ready() { if d.poll(cx).is_ready() {
this.delay.set(None); *this.blocked = false;
} else { } else {
return Poll::Pending; return Poll::Pending;
} }
@ -57,7 +61,8 @@ impl<S: Stream> Stream for Throttle<S> {
} }
Poll::Ready(None) => Poll::Ready(None), Poll::Ready(None) => Poll::Ready(None),
Poll::Ready(Some(v)) => { Poll::Ready(Some(v)) => {
this.delay.set(Some(Delay::new(*this.duration))); *this.blocked = true;
this.delay.reset(Instant::now() + *this.duration);
Poll::Ready(Some(v)) Poll::Ready(Some(v))
} }
} }