From a5df2ea00de95ec8b09459d38c11d53ecb894897 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Sun, 15 Jan 2023 12:12:52 -0800 Subject: [PATCH] make deadlock feature optional --- web3_proxy/src/bin/web3_proxy.rs | 47 ++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/web3_proxy/src/bin/web3_proxy.rs b/web3_proxy/src/bin/web3_proxy.rs index c61b5476..5a951c8f 100644 --- a/web3_proxy/src/bin/web3_proxy.rs +++ b/web3_proxy/src/bin/web3_proxy.rs @@ -12,18 +12,22 @@ use anyhow::Context; use futures::StreamExt; use log::{debug, error, info, warn}; use num::Zero; -use parking_lot::deadlock; use std::fs; use std::path::Path; use std::sync::atomic::{self, AtomicUsize}; -use std::thread; use tokio::runtime; use tokio::sync::broadcast; -use tokio::time::Duration; use web3_proxy::app::{flatten_handle, flatten_handles, Web3ProxyApp}; use web3_proxy::config::{CliConfig, TopConfig}; use web3_proxy::{frontend, metrics_frontend}; +#[cfg(feature = "deadlock")] +use parking_lot::deadlock; +#[cfg(feature = "deadlock")] +use std::thread; +#[cfg(feature = "deadlock")] +use tokio::time::Duration; + fn run( shutdown_sender: broadcast::Sender<()>, cli_config: CliConfig, @@ -34,24 +38,26 @@ fn run( let mut shutdown_receiver = shutdown_sender.subscribe(); - // spawn a thread for deadlock detection - // TODO: disable this feature during release mode and things should go faster - thread::spawn(move || loop { - thread::sleep(Duration::from_secs(10)); - let deadlocks = deadlock::check_deadlock(); - if deadlocks.is_empty() { - continue; - } - - println!("{} deadlocks detected", deadlocks.len()); - for (i, threads) in deadlocks.iter().enumerate() { - println!("Deadlock #{}", i); - for t in threads { - println!("Thread Id {:#?}", t.thread_id()); - println!("{:#?}", t.backtrace()); + #[cfg(feature = "deadlock")] + { + // spawn a thread for deadlock detection + thread::spawn(move || loop { + thread::sleep(Duration::from_secs(10)); + let deadlocks = deadlock::check_deadlock(); + if deadlocks.is_empty() { + continue; } - } - }); + + println!("{} deadlocks detected", deadlocks.len()); + for (i, threads) in deadlocks.iter().enumerate() { + println!("Deadlock #{}", i); + for t in threads { + println!("Thread Id {:#?}", t.thread_id()); + println!("{:#?}", t.backtrace()); + } + } + }); + } // set up tokio's async runtime let mut rt_builder = runtime::Builder::new_multi_thread(); @@ -248,6 +254,7 @@ mod tests { }; use hashbrown::HashMap; use std::env; + use std::thread; use web3_proxy::{ config::{AppConfig, Web3ConnectionConfig},