cy/nixcp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix upload count

Browse source
This commit is contained in:
cy 2025-04-15 20:00:55 -04:00
parent 03530a2afa
commit 4895720831
Signed by: cy
SSH key fingerprint: SHA256:o/geVWV4om1QhUSkKvDQeW/eAihwnjyXkqMwrVdbuts
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/push.rs
View file

@ -30,6 +30,8 @@ pub struct Push {
upstream_hit_count: AtomicUsize,
// paths that we skipped cause they are already on our cache
already_exists_count: AtomicUsize,
// paths that we uploaded
upload_count: AtomicUsize,
}
impl Push {
@ -68,6 +70,7 @@ impl Push {
signature_hit_count: AtomicUsize::new(0),
upstream_hit_count: AtomicUsize::new(0),
already_exists_count: AtomicUsize::new(0),
upload_count: AtomicUsize::new(0),
})
}
@ -139,7 +142,6 @@ impl Push {
}
async fn upload(&'static self, mut rx: mpsc::Receiver<PathInfo>) -> Result<()> {
let upload_count = AtomicUsize::new(0);
let mut uploads = Vec::with_capacity(10);
loop {
@ -154,7 +156,11 @@ impl Push {
self.bucket.clone(),
)?;
uploads.push(tokio::spawn(async move { uploader.upload().await }));
uploads.push(tokio::spawn(async move {
let res = uploader.upload().await;
self.upload_count.fetch_add(1, Ordering::Relaxed);
res
}));
} else {
join_all(uploads)
.await
@ -162,7 +168,7 @@ impl Push {
.flatten()
.collect::<Result<Vec<_>>>()?;
println!("uploaded: {}", upload_count.load(Ordering::Relaxed));
println!("uploaded: {}", self.upload_count.load(Ordering::Relaxed));
println!(
"skipped because of signature match: {}",
self.signature_hit_count.load(Ordering::Relaxed)