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.

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

perf(source): Don't du on every git source load #14252

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/cargo/core/global_cache_tracker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1800,7 +1800,7 @@ pub fn is_silent_error(e: &anyhow::Error) -> bool {

/// Returns the disk usage for a git checkout directory.
#[tracing::instrument]
pub fn du_git_checkout(path: &Path) -> CargoResult<u64> {
fn du_git_checkout(path: &Path) -> CargoResult<u64> {
// !.git is used because clones typically use hardlinks for the git
// contents. TODO: Verify behavior on Windows.
// TODO: Or even better, switch to worktrees, and remove this.
Expand Down
14 changes: 5 additions & 9 deletions src/cargo/sources/git/source.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ impl<'gctx> GitSource<'gctx> {
self.path_source.as_mut().unwrap().read_packages()
}

fn mark_used(&self, size: Option<u64>) -> CargoResult<()> {
fn mark_used(&self) -> CargoResult<()> {
self.gctx
.deferred_global_last_use()?
.mark_git_checkout_used(global_cache_tracker::GitCheckout {
encoded_git_name: self.ident,
short_name: self.short_id.expect("update before download"),
size,
size: None,
});
Ok(())
}
Expand Down Expand Up @@ -268,7 +268,7 @@ impl<'gctx> Source for GitSource<'gctx> {

fn block_until_ready(&mut self) -> CargoResult<()> {
if self.path_source.is_some() {
self.mark_used(None)?;
self.mark_used()?;
return Ok(());
}

Expand Down Expand Up @@ -363,11 +363,7 @@ impl<'gctx> Source for GitSource<'gctx> {
self.locked_rev = Revision::Locked(actual_rev);
self.path_source.as_mut().unwrap().load()?;

// Hopefully this shouldn't incur too much of a performance hit since
// most of this should already be in cache since it was just
// extracted.
let size = global_cache_tracker::du_git_checkout(&checkout_path)?;
self.mark_used(Some(size))?;
self.mark_used()?;
Ok(())
}

Expand All @@ -377,7 +373,7 @@ impl<'gctx> Source for GitSource<'gctx> {
id,
self.remote
);
self.mark_used(None)?;
self.mark_used()?;
self.path_source
.as_mut()
.expect("BUG: `update()` must be called before `get()`")
Expand Down