Exit signal cleanup: pass in references, make the receiver clone as needed

tests/gossip.rs

@@ -16,7 +16,7 @@ use std::sync::{Arc, RwLock};
 use std::thread::sleep;
 use std::time::Duration;
 
-fn test_node(exit: Arc<AtomicBool>) -> (Arc<RwLock<ClusterInfo>>, GossipService, UdpSocket) {
+fn test_node(exit: &Arc<AtomicBool>) -> (Arc<RwLock<ClusterInfo>>, GossipService, UdpSocket) {
     let keypair = Keypair::new();
     let mut tn = Node::new_localhost_with_pubkey(keypair.pubkey());
     let cluster_info = ClusterInfo::new_with_keypair(tn.info.clone(), Arc::new(keypair));
@@ -35,7 +35,7 @@ where
     F: Fn(&Vec<(Arc<RwLock<ClusterInfo>>, GossipService, UdpSocket)>) -> (),
 {
     let exit = Arc::new(AtomicBool::new(false));
-    let listen: Vec<_> = (0..num).map(|_| test_node(exit.clone())).collect();
+    let listen: Vec<_> = (0..num).map(|_| test_node(&exit)).collect();
     topo(&listen);
     let mut done = true;
     for i in 0..(num * 32) {
@@ -142,11 +142,11 @@ pub fn cluster_info_retransmit() -> result::Result<()> {
     solana_logger::setup();
     let exit = Arc::new(AtomicBool::new(false));
     trace!("c1:");
-    let (c1, dr1, tn1) = test_node(exit.clone());
+    let (c1, dr1, tn1) = test_node(&exit);
     trace!("c2:");
-    let (c2, dr2, tn2) = test_node(exit.clone());
+    let (c2, dr2, tn2) = test_node(&exit);
     trace!("c3:");
-    let (c3, dr3, tn3) = test_node(exit.clone());
+    let (c3, dr3, tn3) = test_node(&exit);
     let c1_data = c1.read().unwrap().my_data().clone();
     c1.write().unwrap().set_leader(c1_data.id);
 

tests/tvu.rs

@@ -32,7 +32,7 @@ use std::time::Duration;
 fn new_gossip(
     cluster_info: Arc<RwLock<ClusterInfo>>,
     gossip: UdpSocket,
-    exit: Arc<AtomicBool>,
+    exit: &Arc<AtomicBool>,
 ) -> GossipService {
     GossipService::new(&cluster_info, None, None, gossip, exit)
 }
@@ -52,14 +52,14 @@ fn test_replay() {
     cluster_info_l.set_leader(leader.info.id);
 
     let cref_l = Arc::new(RwLock::new(cluster_info_l));
-    let dr_l = new_gossip(cref_l, leader.sockets.gossip, exit.clone());
+    let dr_l = new_gossip(cref_l, leader.sockets.gossip, &exit);
 
     // start cluster_info2
     let mut cluster_info2 = ClusterInfo::new(target2.info.clone());
     cluster_info2.insert_info(leader.info.clone());
     cluster_info2.set_leader(leader.info.id);
     let cref2 = Arc::new(RwLock::new(cluster_info2));
-    let dr_2 = new_gossip(cref2, target2.sockets.gossip, exit.clone());
+    let dr_2 = new_gossip(cref2, target2.sockets.gossip, &exit);
 
     // setup some blob services to send blobs into the socket
     // to simulate the source peer and get blobs out of the socket to
@@ -102,7 +102,7 @@ fn test_replay() {
     cluster_info1.insert_info(leader.info.clone());
     cluster_info1.set_leader(leader.info.id);
     let cref1 = Arc::new(RwLock::new(cluster_info1));
-    let dr_1 = new_gossip(cref1.clone(), target1.sockets.gossip, exit.clone());
+    let dr_1 = new_gossip(cref1.clone(), target1.sockets.gossip, &exit);
 
     let blocktree_path = get_tmp_ledger_path!();
 
@@ -131,7 +131,7 @@ fn test_replay() {
         ledger_signal_receiver,
         &Arc::new(RpcSubscriptions::default()),
         &poh_recorder,
-        exit.clone(),
+        &exit,
     );
 
     let mut alice_ref_balance = starting_balance;