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

fix leak

This commit is contained in:
Rob Walker 2018-07-31 16:52:50 -07:00
parent a58df52205
commit 2ece27ee3a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/streamer.rs
View File

@ -173,6 +173,7 @@ pub fn blob_receiver(
fn find_next_missing( fn find_next_missing(
window: &SharedWindow, window: &SharedWindow,
crdt: &Arc<RwLock<Crdt>>, crdt: &Arc<RwLock<Crdt>>,
recycler: &BlobRecycler,
consumed: u64, consumed: u64,
received: u64, received: u64,
) -> Result<Vec<(SocketAddr, Vec<u8>)>> { ) -> Result<Vec<(SocketAddr, Vec<u8>)>> {
@ -188,6 +189,8 @@ fn find_next_missing(
let blob_idx = blob.read().unwrap().get_index().unwrap(); let blob_idx = blob.read().unwrap().get_index().unwrap();
if blob_idx == pix { if blob_idx == pix {
mem::replace(&mut window[i].data, Some(blob)); mem::replace(&mut window[i].data, Some(blob));
} else {
recycler.recycle(blob);
} }
} }
if window[i].data.is_none() { if window[i].data.is_none() {
@ -206,6 +209,7 @@ fn repair_window(
debug_id: u64, debug_id: u64,
window: &SharedWindow, window: &SharedWindow,
crdt: &Arc<RwLock<Crdt>>, crdt: &Arc<RwLock<Crdt>>,
recycler: &BlobRecycler,
last: &mut u64, last: &mut u64,
times: &mut usize, times: &mut usize,
consumed: u64, consumed: u64,
@ -223,7 +227,7 @@ fn repair_window(
return Ok(()); return Ok(());
} }
let reqs = find_next_missing(window, crdt, consumed, received)?; let reqs = find_next_missing(window, crdt, recycler, consumed, received)?;
trace!("{:x}: repair_window missing: {}", debug_id, reqs.len()); trace!("{:x}: repair_window missing: {}", debug_id, reqs.len());
if !reqs.is_empty() { if !reqs.is_empty() {
inc_new_counter!("streamer-repair_window-repair", reqs.len()); inc_new_counter!("streamer-repair_window-repair", reqs.len());
@ -673,7 +677,7 @@ pub fn window(
} }
} }
let _ = repair_window( let _ = repair_window(
debug_id, &window, &crdt, &mut last, &mut times, consumed, received, debug_id, &window, &crdt, &recycler, &mut last, &mut times, consumed, received,
); );
} }
}) })