Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use atomic instead of mutex in du function #13253

Closed
wants to merge 2 commits into from
Closed

Use atomic instead of mutex in du function #13253

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f067550
feat: use atomic instead of mutex in du function
BD103 Jan 5, 2024
cf76fa6
feat: cfg-gate atomic in du function
BD103 Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions crates/cargo-util/src/du.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use anyhow::{Context, Result};
use ignore::overrides::OverrideBuilder;
use ignore::{WalkBuilder, WalkState};
use std::path::Path;
use std::sync::atomic::{AtomicU64, Ordering};
use std::sync::{Arc, Mutex};

/// Determines the disk usage of all files in the given directory.
Expand Down Expand Up @@ -39,7 +40,7 @@ fn du_inner(path: &Path, patterns: &[&str]) -> Result<u64> {
.git_ignore(false)
.git_exclude(false);
let walker = builder.build_parallel();
let total = Arc::new(Mutex::new(0u64));
let total = AtomicU64::new(0);
// A slot used to indicate there was an error while walking.
//
// It is possible that more than one error happens (such as in different
Expand All @@ -51,8 +52,8 @@ fn du_inner(path: &Path, patterns: &[&str]) -> Result<u64> {
Ok(entry) => match entry.metadata() {
Ok(meta) => {
if meta.is_file() {
let mut lock = total.lock().unwrap();
*lock += meta.len();
// Note that fetch_add may wrap the u64.
total.fetch_add(meta.len(), Ordering::Relaxed);
}
}
Err(e) => {
Expand All @@ -73,6 +74,5 @@ fn du_inner(path: &Path, patterns: &[&str]) -> Result<u64> {
return Err(e);
}

let total = *total.lock().unwrap();
Ok(total)
Ok(total.load(Ordering::Relaxed))
}
Loading