From ebc458cd320fba1d8f77de06923e7ac9feb6b8a9 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Wed, 9 May 2018 15:27:33 -0600 Subject: [PATCH] Remove redundant Arcs --- src/tpu.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/tpu.rs b/src/tpu.rs index 77ca81348..91ff47094 100644 --- a/src/tpu.rs +++ b/src/tpu.rs @@ -46,7 +46,7 @@ impl Tpu { } } - fn update_entry(obj: &SharedTpu, writer: &Arc>, entry: &Entry) { + fn update_entry(obj: &Tpu, writer: &Mutex, entry: &Entry) { trace!("update_entry entry"); obj.accounting.acc.register_entry_id(&entry.id); writeln!( @@ -58,7 +58,7 @@ impl Tpu { .notify_entry_info_subscribers(&entry); } - fn receive_all(obj: &SharedTpu, writer: &Arc>) -> Result> { + fn receive_all(obj: &Tpu, writer: &Mutex) -> Result> { //TODO implement a serialize for channel that does this without allocations let mut l = vec![]; let entry = obj.accounting @@ -120,7 +120,7 @@ impl Tpu { obj: SharedTpu, broadcast: &streamer::BlobSender, blob_recycler: &packet::BlobRecycler, - writer: &Arc>, + writer: &Mutex, ) -> Result<()> { let mut q = VecDeque::new(); let list = Self::receive_all(&obj, writer)?; @@ -137,7 +137,7 @@ impl Tpu { exit: Arc, broadcast: streamer::BlobSender, blob_recycler: packet::BlobRecycler, - writer: Arc>, + writer: Mutex, ) -> JoinHandle<()> { spawn(move || loop { let _ = Self::run_sync(obj.clone(), &broadcast, &blob_recycler, &writer); @@ -303,7 +303,7 @@ impl Tpu { } fn process( - obj: &SharedTpu, + obj: &Tpu, verified_receiver: &Receiver)>>, responder_sender: &streamer::BlobSender, packet_recycler: &packet::PacketRecycler, @@ -368,7 +368,7 @@ impl Tpu { /// Process verified blobs, already in order /// Respond with a signed hash of the state fn replicate_state( - obj: &SharedTpu, + obj: &Tpu, verified_receiver: &streamer::BlobReceiver, blob_recycler: &packet::BlobRecycler, ) -> Result<()> { @@ -460,7 +460,7 @@ impl Tpu { exit.clone(), broadcast_sender, blob_recycler.clone(), - Arc::new(Mutex::new(writer)), + Mutex::new(writer), ); let t_skinny = Self::thin_client_service(obj.accounting.acc.clone(), exit.clone(), skinny);