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

fix: wrong use of Instant sub, just after booting (#8470)

Browse Source 
* fix: wrong use of Instant sub, just after booting

Signed-off-by: fufesou <linlong1266@gmail.com>

* fix: ThrottledInterval, first next tick

Signed-off-by: fufesou <linlong1266@gmail.com>

---------

Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2024-06-25 20:33:38 +08:00 committed by GitHub
parent c1c2d26ec7
commit f0dcc91907
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common.rs
View File

@ -1434,7 +1434,7 @@ pub fn using_public_server() -> bool {
pub struct ThrottledInterval { pub struct ThrottledInterval {
interval: Interval, interval: Interval,
last_tick: Instant, next_tick: Instant,
min_interval: Duration, min_interval: Duration,
} }
@ -1443,7 +1443,7 @@ impl ThrottledInterval {
let period = i.period(); let period = i.period();
ThrottledInterval { ThrottledInterval {
interval: i, interval: i,
last_tick: Instant::now() - period * 2, next_tick: Instant::now(),
min_interval: Duration::from_secs_f64(period.as_secs_f64() * 0.9), min_interval: Duration::from_secs_f64(period.as_secs_f64() * 0.9),
} }
} }
@ -1456,8 +1456,9 @@ impl ThrottledInterval {
pub fn poll_tick(&mut self, cx: &mut std::task::Context<'_>) -> Poll<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 { let now = Instant::now();
self.last_tick = Instant::now(); if self.next_tick <= now {
self.next_tick = now + self.min_interval;
Poll::Ready(instant) Poll::Ready(instant)
} else { } else {
// This call is required since tokio 1.27 // This call is required since tokio 1.27