YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-04-01 18:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

aquatic_ws: pending scrape responses: avoid cloning stats

Browse source
This commit is contained in:
Joakim Frostegård 2021-11-01 22:17:31 +01:00
parent 07e1b8230f
commit 724932a498
1 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

31
aquatic_ws/src/lib/network.rs
View file

@ -394,32 +394,33 @@ impl ConnectionWriter {
.pending_scrape_id .pending_scrape_id
.expect("meta.pending_scrape_id not set"); .expect("meta.pending_scrape_id not set");
let opt_message = if let Some(pending) = Slab::get_mut( let finished = if let Some(pending) = Slab::get_mut(
&mut RefCell::borrow_mut(&self.pending_scrape_slab), &mut RefCell::borrow_mut(&self.pending_scrape_slab),
pending_scrape_id.0, pending_scrape_id.0,
) { ) {
pending.stats.extend(out_message.files); pending.stats.extend(out_message.files);
pending.pending_worker_out_messages -= 1; pending.pending_worker_out_messages -= 1;
if pending.pending_worker_out_messages == 0 { pending.pending_worker_out_messages == 0
Some(OutMessage::ScrapeResponse(ScrapeResponse {
action: ScrapeAction,
files: pending.stats.clone(), // FIXME: clone
}))
} else {
None
}
} else { } else {
return Err(anyhow::anyhow!("pending scrape not found in slab")); return Err(anyhow::anyhow!("pending scrape not found in slab"));
}; };
if let Some(out_message) = opt_message { if finished {
self.send_out_message(&out_message).await?; let out_message = {
let mut slab = RefCell::borrow_mut(&self.pending_scrape_slab);
let mut slab = RefCell::borrow_mut(&self.pending_scrape_slab); let pending = slab.remove(pending_scrape_id.0);
slab.remove(pending_scrape_id.0); slab.shrink_to_fit();
slab.shrink_to_fit();
OutMessage::ScrapeResponse(ScrapeResponse {
action: ScrapeAction,
files: pending.stats,
})
};
self.send_out_message(&out_message).await?;
} }
} }
out_message => { out_message => {