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

Fix deadlock and only push to contq if it's not a coding blob

This commit is contained in:
Stephen Akridge 2018-05-31 15:48:29 -07:00 committed by Greg Fitzgerald
parent 00c8505d1e
commit d1eaecde9a
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/streamer.rs
View File

@ -273,6 +273,7 @@ fn recv_window(
//if we get different blocks at the same index
//that is a network failure/attack
trace!("window w: {} size: {}", w, p.meta.size);
drop(p);
{
let mut window = locked_window.write().unwrap();
if window[w].is_none() {
@ -290,12 +291,15 @@ fn recv_window(
if window[k].is_none() {
break;
}
let w_l1 = window[k].clone().unwrap();
let w_l2 = w_l1.read().unwrap();
if (w_l2.get_flags().unwrap() & BLOB_FLAG_IS_CODING) != 0 {
break;
let mut is_coding = false;
if let &Some(ref cblob) = &window[k] {
if (cblob.read().expect("blob read lock for flags streamer::window").get_flags().unwrap() & BLOB_FLAG_IS_CODING) != 0 {
is_coding = true;
}
}
if !is_coding {
contq.push_back(window[k].clone().expect("clone in fn recv_window"));
}
contq.push_back(window[k].clone().expect("clone in fn recv_window"));
window[k] = None;
*consumed += 1;
}