gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hoist window write lock

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-09-07 11:45:59 -06:00
parent 78b3a8f7f9
commit d5f60b68e4
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/window.rs
View File

@@ -113,7 +113,7 @@ fn repair_backoff(last: &mut u64, times: &mut usize, consumed: u64) -> bool {
} }
fn repair_window( fn repair_window(
window: &SharedWindow, window: &mut Window,
crdt: &Arc<RwLock<Crdt>>, crdt: &Arc<RwLock<Crdt>>,
recycler: &BlobRecycler, recycler: &BlobRecycler,
id: &Pubkey, id: &Pubkey,
@@ -124,8 +124,7 @@ fn repair_window(
let num_peers = crdt.read().unwrap().table.len() as u64; let num_peers = crdt.read().unwrap().table.len() as u64;
let highest_lost = calculate_highest_lost_blob_index(num_peers, consumed, received); let highest_lost = calculate_highest_lost_blob_index(num_peers, consumed, received);
let mut window = window.write().unwrap(); let idxs = clear_window_slots(window, recycler, consumed, highest_lost);
let idxs = clear_window_slots(&mut window, recycler, consumed, highest_lost);
let reqs: Vec<_> = idxs let reqs: Vec<_> = idxs
.into_iter() .into_iter()
.filter_map(|pix| crdt.read().unwrap().window_index_request(pix).ok()) .filter_map(|pix| crdt.read().unwrap().window_index_request(pix).ok())
@@ -659,7 +658,16 @@ pub fn window(
continue; continue;
} }
let reqs = repair_window(&window, &crdt, &recycler, &id, times, consumed, received); let mut window = window.write().unwrap();
let reqs = repair_window(
&mut window,
&crdt,
&recycler,
&id,
times,
consumed,
received,
);
for (to, req) in reqs { for (to, req) in reqs {
repair_socket.send_to(&req, to).unwrap_or_else(|e| { repair_socket.send_to(&req, to).unwrap_or_else(|e| {
info!("{} repair req send_to({}) error {:?}", id, to, e); info!("{} repair req send_to({}) error {:?}", id, to, e);