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

Fix erasure compilation

This commit is contained in:
Stephen Akridge 2018-05-24 17:19:49 -07:00 committed by Greg Fitzgerald
parent f1075191fe
commit ea97529185
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/erasure.rs
View File

@ -153,7 +153,7 @@ pub fn decode_blocks(data: &mut [&mut [u8]], coding: &[&[u8]], erasures: &[i32])
// Generate coding blocks in window from consumed to consumed+NUM_DATA // Generate coding blocks in window from consumed to consumed+NUM_DATA
pub fn generate_coding( pub fn generate_coding(
re: &BlobRecycler, re: &BlobRecycler,
window: &mut Vec<SharedBlob>, window: &mut Vec<Option<SharedBlob>>,
consumed: usize, consumed: usize,
) -> Result<()> { ) -> Result<()> {
let mut data_blobs = Vec::new(); let mut data_blobs = Vec::new();
@ -183,7 +183,7 @@ pub fn generate_coding(
let coding_end = consumed + NUM_CODED; let coding_end = consumed + NUM_CODED;
for i in coding_start..coding_end { for i in coding_start..coding_end {
let n = i % window.len(); let n = i % window.len();
window[n] = re.allocate(); window[n] = Some(re.allocate());
coding_blobs.push( coding_blobs.push(
window[n] window[n]
.clone() .clone()

9
src/streamer.rs
View File

@ -377,9 +377,14 @@ fn broadcast(
dq.append(&mut nq); dq.append(&mut nq);
} }
let mut blobs = dq.into_iter().collect(); let mut blobs = dq.into_iter().collect();
/// appends codes to the list of blobs allowing us to reconstruct the stream // appends codes to the list of blobs allowing us to reconstruct the stream
#[cfg(feature = "erasure")] #[cfg(feature = "erasure")]
erasure::generate_coding(re, blobs, consumed); {
match erasure::generate_coding(recycler, &mut window.write().unwrap(), *transmit_index as usize) {
Err(_e) => { return Err(Error::GenericError) }
_ => {}
}
}
Crdt::broadcast(crdt, &blobs, &sock, transmit_index)?; Crdt::broadcast(crdt, &blobs, &sock, transmit_index)?;
// keep the cache of blobs that are broadcast // keep the cache of blobs that are broadcast
{ {