Move creating blobs into its own function

This commit is contained in:
Greg Fitzgerald 2018-04-06 16:21:20 -06:00
parent 7bd3a8e004
commit a93ec03d2c
1 changed files with 21 additions and 12 deletions

View File

@ -149,6 +149,23 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
.collect() .collect()
} }
fn create_blob_from_response(
blob_recycler: &packet::BlobRecycler,
resp: Response,
rsp_addr: SocketAddr,
) -> Result<packet::SharedBlob> {
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);
}
Ok(blob)
}
fn process_packets( fn process_packets(
obj: &Arc<Mutex<AccountantSkel<W>>>, obj: &Arc<Mutex<AccountantSkel<W>>>,
reqs: Vec<Option<(Request, SocketAddr)>>, reqs: Vec<Option<(Request, SocketAddr)>>,
@ -162,15 +179,7 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
continue; continue;
} }
if let Some(resp) = obj.lock().unwrap().log_verified_request(req, v) { if let Some(resp) = obj.lock().unwrap().log_verified_request(req, v) {
let blob = blob_recycler.allocate(); let blob = Self::create_blob_from_response(blob_recycler, resp, rsp_addr)?;
{
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); rsps.push_back(blob);
} }
} }
@ -189,10 +198,10 @@ impl<W: Write + Send + 'static> AccountantSkel<W> {
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 reqs = Self::deserialize_packets(&msgs.read().unwrap()); let reqs = Self::deserialize_packets(&msgs.read().unwrap());
let rsps = Self::process_packets(obj, reqs, vers, blob_recycler)?; let blobs = Self::process_packets(obj, reqs, vers, blob_recycler)?;
if !rsps.is_empty() { if !blobs.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(blobs)?;
} }
packet_recycler.recycle(msgs); packet_recycler.recycle(msgs);
} }