pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-19 01:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make duration calculation robust against clock drift (#10042)

Browse Source 
It is possible that `Instant::now()` is returning an earlier clock time when being called a second
time. To guard against this, we should use `saturating_duration_since`.
This commit is contained in:
Bastian Köcher
2021-10-18 10:18:13 +02:00
committed by GitHub
parent d7e07d4fb9
commit d25d3896d7
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/db/src/lib.rs
+4 -3
View File
@@ -1076,13 +1076,14 @@ impl<T: Clone> FrozenForDuration<T> {
F: FnOnce() -> T, F: FnOnce() -> T,
{ {
let mut lock = self.value.lock(); let mut lock = self.value.lock();
if lock.at.elapsed() > self.duration || lock.value.is_none() { let now = std::time::Instant::now();
if now.saturating_duration_since(lock.at) > self.duration || lock.value.is_none() {
let new_value = f(); let new_value = f();
lock.at = std::time::Instant::now(); lock.at = now;
lock.value = Some(new_value.clone()); lock.value = Some(new_value.clone());
new_value new_value
} else { } else {
lock.value.as_ref().expect("checked with lock above").clone() lock.value.as_ref().expect("Checked with in branch above; qed").clone()
} }
} }
} }