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

Reduce cyclomatic complexity

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-04-06 16:12:13 -06:00
parent 912a5f951e
commit 7bd3a8e004
1 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/accountant_skel.rs
View File

@ -149,6 +149,35 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
.collect() .collect()
} }
fn process_packets(
obj: &Arc<Mutex<AccountantSkel<W>>>,
reqs: Vec<Option<(Request, SocketAddr)>>,
vers: Vec<u8>,
blob_recycler: &packet::BlobRecycler,
) -> Result<VecDeque<packet::SharedBlob>> {
let mut rsps = VecDeque::new();
for (data, v) in reqs.into_iter().zip(vers.into_iter()) {
if let Some((req, rsp_addr)) = data {
if !req.verify() {
continue;
}
if let Some(resp) = obj.lock().unwrap().log_verified_request(req, v) {
let blob = blob_recycler.allocate();
{
let mut b = blob.write().unwrap();
let v = serialize(&resp)?;
let len = v.len();
b.data[..len].copy_from_slice(&v);
b.meta.size = len;
b.meta.set_addr(&rsp_addr);
}
rsps.push_back(blob);
}
}
}
Ok(rsps)
}
fn process( fn process(
obj: &Arc<Mutex<AccountantSkel<W>>>, obj: &Arc<Mutex<AccountantSkel<W>>>,
verified_receiver: &Receiver<(Vec<SharedPackets>, Vec<Vec<u8>>)>, verified_receiver: &Receiver<(Vec<SharedPackets>, Vec<Vec<u8>>)>,
@ -159,29 +188,8 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
let timer = Duration::new(1, 0); let timer = Duration::new(1, 0);
let (mms, vvs) = verified_receiver.recv_timeout(timer)?; let (mms, vvs) = verified_receiver.recv_timeout(timer)?;
for (msgs, vers) in mms.into_iter().zip(vvs.into_iter()) { for (msgs, vers) in mms.into_iter().zip(vvs.into_iter()) {
let mut rsps = VecDeque::new(); let reqs = Self::deserialize_packets(&msgs.read().unwrap());
{ let rsps = Self::process_packets(obj, reqs, vers, blob_recycler)?;
let reqs = Self::deserialize_packets(&((*msgs).read().unwrap()));
for (data, v) in reqs.into_iter().zip(vers.into_iter()) {
if let Some((req, rsp_addr)) = data {
if !req.verify() {
continue;
}
if let Some(resp) = obj.lock().unwrap().log_verified_request(req, v) {
let blob = blob_recycler.allocate();
{
let mut b = blob.write().unwrap();
let v = serialize(&resp)?;
let len = v.len();
b.data[..len].copy_from_slice(&v);
b.meta.size = len;
b.meta.set_addr(&rsp_addr);
}
rsps.push_back(blob);
}
}
}
}
if !rsps.is_empty() { if !rsps.is_empty() {
//don't wake up the other side if there is nothing //don't wake up the other side if there is nothing
blob_sender.send(rsps)?; blob_sender.send(rsps)?;