From f5f4434e0a4f939e9c4214d5bfc67eb898dc9db1 Mon Sep 17 00:00:00 2001 From: Sagar Dhawan Date: Fri, 5 Apr 2019 16:15:14 -0700 Subject: [PATCH] Remove unnecessary lock in sigverify --- core/src/sigverify_stage.rs | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/src/sigverify_stage.rs b/core/src/sigverify_stage.rs index 94e2f6bb36..4a97a1427f 100644 --- a/core/src/sigverify_stage.rs +++ b/core/src/sigverify_stage.rs @@ -49,7 +49,7 @@ impl SigVerifyStage { fn verifier( recvr: &Arc>, - sendr: &Arc>>, + sendr: &Sender, sigverify_disabled: bool, ) -> Result<()> { let (batch, len, recv_time) = @@ -72,12 +72,7 @@ impl SigVerifyStage { verified_batch.len() ); - if sendr - .lock() - .expect("lock in fn verify_batch in tpu") - .send(verified_batch) - .is_err() - { + if sendr.send(verified_batch).is_err() { return Err(Error::SendError); } @@ -113,7 +108,7 @@ impl SigVerifyStage { fn verifier_service( packet_receiver: Arc>, - verified_sender: Arc>>, + verified_sender: Sender, sigverify_disabled: bool, ) -> JoinHandle<()> { spawn(move || loop { @@ -135,10 +130,15 @@ impl SigVerifyStage { verified_sender: Sender, sigverify_disabled: bool, ) -> Vec> { - let sender = Arc::new(Mutex::new(verified_sender)); let receiver = Arc::new(Mutex::new(packet_receiver)); (0..4) - .map(|_| Self::verifier_service(receiver.clone(), sender.clone(), sigverify_disabled)) + .map(|_| { + Self::verifier_service( + receiver.clone(), + verified_sender.clone(), + sigverify_disabled, + ) + }) .collect() } }