mirror of
https://github.com/deuxfleurs-org/garage.git
synced 2026-08-09 06:09:23 +00:00
Fix instant substractions that might have panicked
This commit is contained in:
+11
-5
@@ -1,4 +1,4 @@
|
||||
use std::time::SystemTime;
|
||||
use std::time::Instant;
|
||||
|
||||
use futures::{future::BoxFuture, Future, FutureExt};
|
||||
use rand::Rng;
|
||||
@@ -28,10 +28,12 @@ where
|
||||
attributes: &'a [KeyValue],
|
||||
) -> BoxFuture<'a, Self::Output> {
|
||||
async move {
|
||||
let request_start = SystemTime::now();
|
||||
let request_start = Instant::now();
|
||||
let res = self.await;
|
||||
r.record(
|
||||
request_start.elapsed().map_or(0.0, |d| d.as_secs_f64()),
|
||||
Instant::now()
|
||||
.saturating_duration_since(request_start)
|
||||
.as_secs_f64(),
|
||||
attributes,
|
||||
);
|
||||
res
|
||||
@@ -41,9 +43,13 @@ where
|
||||
|
||||
fn bound_record_duration(self, r: &'a BoundValueRecorder<f64>) -> BoxFuture<'a, Self::Output> {
|
||||
async move {
|
||||
let request_start = SystemTime::now();
|
||||
let request_start = Instant::now();
|
||||
let res = self.await;
|
||||
r.record(request_start.elapsed().map_or(0.0, |d| d.as_secs_f64()));
|
||||
r.record(
|
||||
Instant::now()
|
||||
.saturating_duration_since(request_start)
|
||||
.as_secs_f64(),
|
||||
);
|
||||
res
|
||||
}
|
||||
.boxed()
|
||||
|
||||
@@ -36,7 +36,7 @@ impl Tranquilizer {
|
||||
}
|
||||
|
||||
fn tranquilize_internal(&mut self, tranquility: u32) -> Option<Duration> {
|
||||
let observation = Instant::now() - self.last_step_begin;
|
||||
let observation = Instant::now().saturating_duration_since(self.last_step_begin);
|
||||
|
||||
self.observations.push_back(observation);
|
||||
self.sum_observations += observation;
|
||||
|
||||
Reference in New Issue
Block a user