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

Don't reference window to get each slot

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-09-07 09:53:35 -06:00
parent e4de25442a
commit d8564b725c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/window.rs
View File

@ -50,16 +50,17 @@ fn find_next_missing(
(consumed..received) (consumed..received)
.filter_map(|pix| { .filter_map(|pix| {
let i = (pix % WINDOW_SIZE) as usize; let i = (pix % WINDOW_SIZE) as usize;
let ref mut slot = &mut window[i];
if let Some(blob) = mem::replace(&mut window[i].data, None) { if let Some(blob) = mem::replace(&mut slot.data, None) {
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 slot.data, Some(blob));
} else { } else {
recycler.recycle(blob, "find_next_missing"); recycler.recycle(blob, "find_next_missing");
} }
} }
if window[i].data.is_none() { if slot.data.is_none() {
let val = crdt.read().unwrap().window_index_request(pix as u64); let val = crdt.read().unwrap().window_index_request(pix as u64);
if let Ok((to, req)) = val { if let Ok((to, req)) = val {
return Some((to, req)); return Some((to, req));