Hoist lock, reposition parameters

This commit is contained in:
Greg Fitzgerald 2018-09-07 12:11:02 -06:00
parent f07ce59be8
commit f7ea95aed1
1 changed files with 2 additions and 3 deletions

View File

@ -261,17 +261,16 @@ fn retransmit_all_leader_blocks(
/// * `consumed` - input/output, the entry-height to which this /// * `consumed` - input/output, the entry-height to which this
/// node has populated and rebroadcast entries /// node has populated and rebroadcast entries
fn process_blob( fn process_blob(
window: &mut Window,
id: &Pubkey, id: &Pubkey,
blob: SharedBlob, blob: SharedBlob,
pix: u64, pix: u64,
consume_queue: &mut SharedBlobs, consume_queue: &mut SharedBlobs,
window: &SharedWindow,
recycler: &BlobRecycler, recycler: &BlobRecycler,
consumed: &mut u64, consumed: &mut u64,
leader_unknown: bool, leader_unknown: bool,
pending_retransmits: &mut bool, pending_retransmits: &mut bool,
) { ) {
let mut window = window.write().unwrap();
let w = (pix % WINDOW_SIZE) as usize; let w = (pix % WINDOW_SIZE) as usize;
let is_coding = { let is_coding = {
@ -453,11 +452,11 @@ fn recv_window(
trace!("{} window pix: {} size: {}", id, pix, meta_size); trace!("{} window pix: {} size: {}", id, pix, meta_size);
process_blob( process_blob(
&mut window.write().unwrap(),
id, id,
b, b,
pix, pix,
&mut consume_queue, &mut consume_queue,
window,
recycler, recycler,
consumed, consumed,
leader_unknown, leader_unknown,