project-serum
/
solana
mirror of https://github.com/project-serum/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove redundant Arcs

This commit is contained in:
Greg Fitzgerald 2018-05-09 15:27:33 -06:00
parent 43cd631579
commit ebc458cd32
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tpu.rs
View File

@ -46,7 +46,7 @@ impl Tpu {
} }
} }
fn update_entry<W: Write>(obj: &SharedTpu, writer: &Arc<Mutex<W>>, entry: &Entry) { fn update_entry<W: Write>(obj: &Tpu, writer: &Mutex<W>, entry: &Entry) {
trace!("update_entry entry"); trace!("update_entry entry");
obj.accounting.acc.register_entry_id(&entry.id); obj.accounting.acc.register_entry_id(&entry.id);
writeln!( writeln!(
@ -58,7 +58,7 @@ impl Tpu {
.notify_entry_info_subscribers(&entry); .notify_entry_info_subscribers(&entry);
} }
fn receive_all<W: Write>(obj: &SharedTpu, writer: &Arc<Mutex<W>>) -> Result<Vec<Entry>> { fn receive_all<W: Write>(obj: &Tpu, writer: &Mutex<W>) -> Result<Vec<Entry>> {
//TODO implement a serialize for channel that does this without allocations //TODO implement a serialize for channel that does this without allocations
let mut l = vec![]; let mut l = vec![];
let entry = obj.accounting let entry = obj.accounting
@ -120,7 +120,7 @@ impl Tpu {
obj: SharedTpu, obj: SharedTpu,
broadcast: &streamer::BlobSender, broadcast: &streamer::BlobSender,
blob_recycler: &packet::BlobRecycler, blob_recycler: &packet::BlobRecycler,
writer: &Arc<Mutex<W>>, writer: &Mutex<W>,
) -> Result<()> { ) -> Result<()> {
let mut q = VecDeque::new(); let mut q = VecDeque::new();
let list = Self::receive_all(&obj, writer)?; let list = Self::receive_all(&obj, writer)?;
@ -137,7 +137,7 @@ impl Tpu {
exit: Arc<AtomicBool>, exit: Arc<AtomicBool>,
broadcast: streamer::BlobSender, broadcast: streamer::BlobSender,
blob_recycler: packet::BlobRecycler, blob_recycler: packet::BlobRecycler,
writer: Arc<Mutex<W>>, writer: Mutex<W>,
) -> JoinHandle<()> { ) -> JoinHandle<()> {
spawn(move || loop { spawn(move || loop {
let _ = Self::run_sync(obj.clone(), &broadcast, &blob_recycler, &writer); let _ = Self::run_sync(obj.clone(), &broadcast, &blob_recycler, &writer);
@ -303,7 +303,7 @@ impl Tpu {
} }
fn process( fn process(
obj: &SharedTpu, obj: &Tpu,
verified_receiver: &Receiver<Vec<(SharedPackets, Vec<u8>)>>, verified_receiver: &Receiver<Vec<(SharedPackets, Vec<u8>)>>,
responder_sender: &streamer::BlobSender, responder_sender: &streamer::BlobSender,
packet_recycler: &packet::PacketRecycler, packet_recycler: &packet::PacketRecycler,
@ -368,7 +368,7 @@ impl Tpu {
/// Process verified blobs, already in order /// Process verified blobs, already in order
/// Respond with a signed hash of the state /// Respond with a signed hash of the state
fn replicate_state( fn replicate_state(
obj: &SharedTpu, obj: &Tpu,
verified_receiver: &streamer::BlobReceiver, verified_receiver: &streamer::BlobReceiver,
blob_recycler: &packet::BlobRecycler, blob_recycler: &packet::BlobRecycler,
) -> Result<()> { ) -> Result<()> {
@ -460,7 +460,7 @@ impl Tpu {
exit.clone(), exit.clone(),
broadcast_sender, broadcast_sender,
blob_recycler.clone(), 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); let t_skinny = Self::thin_client_service(obj.accounting.acc.clone(), exit.clone(), skinny);