Skip to content
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

Fix: Continue sync and lock timer during system sleep #207

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/pkg
/target
/target-ra

.idea
27 changes: 24 additions & 3 deletions src/bin/rbw-agent/timeout.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use std::time::SystemTime;
use futures_util::StreamExt as _;
use tokio::time;

#[derive(Debug, Hash, Eq, PartialEq, Copy, Clone)]
enum Streams {
Expand Down Expand Up @@ -37,9 +39,28 @@ impl Timeout {
(_, Event::Request(Action::Set(dur))) => {
stream.insert(
Streams::Timer,
futures_util::stream::once(tokio::time::sleep(
dur,
))
futures_util::stream::once(async move {
// Need to poll the system time here as otherwise,
// e.g. long-sleep with tokio::time::sleep(dur) or polling Instant::elapsed(),
// the timer will not continue to run down while the system is in sleep or hibernate
let start = SystemTime::now();
loop {
match start.elapsed() {
Ok(elapsed) => {
if elapsed >= dur {
break;
}

tokio::time::sleep(time::Duration::from_secs(1)).await;
}
// Clock went backwards, expire timer immediately just to be cautious
Err(e) => {
eprintln!("Backwards time jump by {:.2}s detected, immediately expire timer.", e.duration().as_secs_f32());
break
}
}
}
})
.map(|()| Event::Timer)
.boxed(),
);
Expand Down
Loading