chore: instant panic

nervosnetwork · Feb 21, 2022 · fa42eb8 · fa42eb8
1 parent 2b543b2
commit fa42eb8
Show file tree

Hide file tree

Showing 16 changed files with 136 additions and 51 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/ckb-bin/src/subcommand/replay.rs b/ckb-bin/src/subcommand/replay.rs
@@ -74,7 +74,7 @@ fn profile(shared: Shared, mut chain: ChainService, from: Option<u64>, to: Optio
     println!("start profiling, re-process blocks {}..{}:", from, to);
     let now = std::time::Instant::now();
     let tx_count = process_range_block(&shared, &mut chain, from..=to);
-    let duration = now.elapsed();
+    let duration = std::time::Instant::now().saturating_duration_since(now);
     println!(
         "end profiling, duration {:?} txs {} tps {}",
         duration,

diff --git a/miner/src/worker/eaglesong_simple.rs b/miner/src/worker/eaglesong_simple.rs
@@ -96,7 +96,7 @@ impl Worker for EaglesongSimple {
                     self.solve(pow_hash, work, rng());
                     state_update_counter += 1;
 
-                    let elapsed = start.elapsed();
+                    let elapsed = Instant::now().saturating_duration_since(start);
                     if elapsed.as_millis() > STATE_UPDATE_DURATION_MILLIS {
                         let elapsed_nanos: f64 = (elapsed.as_secs() * 1_000_000_000
                             + u64::from(elapsed.subsec_nanos()))

diff --git a/network/Cargo.toml b/network/Cargo.toml
@@ -16,7 +16,7 @@ ckb-stop-handler = { path = "../util/stop-handler", version = "= 0.102.0-pre" }
 ckb-logger = { path = "../util/logger", version = "= 0.102.0-pre" }
 ckb-app-config = { path = "../util/app-config", version = "= 0.102.0-pre" }
 tokio = { version = "1", features = ["sync", "macros"] }
-tokio-util = { version = "0.6", features = ["codec"] }
+tokio-util = { version = "0.7", features = ["codec"] }
 futures = "0.3"
 faketime = "0.2.0"
 lazy_static = { version = "1.3.0", optional = true }
@@ -33,7 +33,7 @@ serde_json = "1.0"
 bloom-filters = "0.1"
 ckb-spawn = { path = "../util/spawn", version = "= 0.102.0-pre" }
 
-p2p = { version="=0.4.0-alpha.3", package="tentacle", features = ["upnp", "parking_lot"] }
+p2p = { version="=0.4.0-alpha.4", package="tentacle", features = ["upnp", "parking_lot"] }
 
 [features]
 with_sentry = ["sentry"]

diff --git a/network/src/network.rs b/network/src/network.rs
@@ -343,7 +343,7 @@ impl NetworkState {
                 peer_id,
                 addr
             );
-            if dial_started.elapsed() > DIAL_HANG_TIMEOUT {
+            if Instant::now().saturating_duration_since(*dial_started) > DIAL_HANG_TIMEOUT {
                 #[cfg(feature = "with_sentry")]
                 with_scope(
                     |scope| scope.set_fingerprint(Some(&["ckb-network", "dialing-timeout"])),
@@ -1285,7 +1285,7 @@ impl NetworkController {
                     return Ok(());
                 }
                 Err(SendErrorKind::WouldBlock) => {
-                    if now.elapsed() > P2P_SEND_TIMEOUT {
+                    if Instant::now().saturating_duration_since(now) > P2P_SEND_TIMEOUT {
                         warn!("broadcast message to {} timeout", proto_id);
                         return Err(SendErrorKind::WouldBlock);
                     }

diff --git a/network/src/peer_registry.rs b/network/src/peer_registry.rs
@@ -145,13 +145,14 @@ impl PeerRegistry {
             &mut candidate_peers,
             EVICTION_PROTECT_PEERS,
             |peer1, peer2| {
+                let now = std::time::Instant::now();
                 let peer1_last_message = peer1
                     .last_ping_protocol_message_received_at
-                    .map(|t| t.elapsed().as_secs())
+                    .map(|t| now.saturating_duration_since(t).as_secs())
                     .unwrap_or_else(|| std::u64::MAX);
                 let peer2_last_message = peer2
                     .last_ping_protocol_message_received_at
-                    .map(|t| t.elapsed().as_secs())
+                    .map(|t| now.saturating_duration_since(t).as_secs())
                     .unwrap_or_else(|| std::u64::MAX);
                 peer2_last_message.cmp(&peer1_last_message)
             },