hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refact. Better ThrottledInterval (#7174)

Browse Source 
Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2024-02-18 21:54:07 +08:00 committed by GitHub
parent 8c108065eb
commit 4f1a4dc6a5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/common.rs
View File

@ -1358,24 +1358,20 @@ impl ThrottledInterval {
} }
pub async fn tick(&mut self) -> Instant { pub async fn tick(&mut self) -> Instant {
loop {
let instant = poll_fn(|cx| self.poll_tick(cx)); let instant = poll_fn(|cx| self.poll_tick(cx));
if let Some(instant) = instant.await { instant.await
return instant;
}
}
} }
pub fn poll_tick(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Option<Instant>> { pub fn poll_tick(&mut self, cx: &mut std::task::Context<'_>) -> Poll<Instant> {
match self.interval.poll_tick(cx) { match self.interval.poll_tick(cx) {
Poll::Ready(instant) => { Poll::Ready(instant) => {
if self.last_tick.elapsed() >= self.min_interval { if self.last_tick.elapsed() >= self.min_interval {
self.last_tick = Instant::now(); self.last_tick = Instant::now();
Poll::Ready(Some(instant)) Poll::Ready(instant)
} else { } else {
// This call is required since tokio 1.27 // This call is required since tokio 1.27
cx.waker().wake_by_ref(); cx.waker().wake_by_ref();
Poll::Ready(None) Poll::Pending
} }
} }
Poll::Pending => { Poll::Pending => {
@ -1453,6 +1449,7 @@ mod tests {
assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.923 * 1e-3), Duration::from_micros(923)); assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.923 * 1e-3), Duration::from_micros(923));
assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.923 * 1e-6), Duration::from_nanos(923)); assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.923 * 1e-6), Duration::from_nanos(923));
assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.923 * 1e-9), Duration::from_nanos(1)); assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.923 * 1e-9), Duration::from_nanos(1));
assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.923 * 1e-10), Duration::from_nanos(0)); assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.5 * 1e-9), Duration::from_nanos(1));
assert_eq!(Duration::from_secs_f64(dur.as_secs_f64() * 0.499 * 1e-9), Duration::from_nanos(0));
} }
} }