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

Hoist write lock 

It needed to be passed the lock before, because it contained a
branch where one side didn't require locking. Now that that
defensive programming was hoisted, we can hoist the write lock
as well, leaving a simpler function for unit testing.
This commit is contained in:
Greg Fitzgerald 2018-09-07 09:47:13 -06:00
parent 3b2ea8fd40
commit e4de25442a
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/window.rs
View File

@ -31,7 +31,8 @@ pub struct WindowSlot {
pub leader_unknown: bool,
}
pub type SharedWindow = Arc<RwLock<Vec<WindowSlot>>>;
type Window = Vec<WindowSlot>;
pub type SharedWindow = Arc<RwLock<Window>>;
#[derive(Debug)]
pub struct WindowIndex {
@ -40,13 +41,12 @@ pub struct WindowIndex {
}
fn find_next_missing(
window: &SharedWindow,
window: &mut Window,
crdt: &Arc<RwLock<Crdt>>,
recycler: &BlobRecycler,
consumed: u64,
received: u64,
) -> Vec<(SocketAddr, Vec<u8>)> {
let mut window = window.write().unwrap();
(consumed..received)
.filter_map(|pix| {
let i = (pix % WINDOW_SIZE) as usize;
@ -132,7 +132,8 @@ fn repair_window(
return None;
}
let reqs = find_next_missing(window, crdt, recycler, consumed, highest_lost);
let mut window = window.write().unwrap();
let reqs = find_next_missing(&mut window, crdt, recycler, consumed, highest_lost);
inc_new_counter_info!("streamer-repair_window-repair", reqs.len());
if log_enabled!(Level::Trace) {
trace!(