libutil/tarfile: Create the scratch std::vector only once#13175
Merged
Mic92 merged 1 commit intoNixOS:masterfrom May 13, 2025
Merged
libutil/tarfile: Create the scratch std::vector only once#13175Mic92 merged 1 commit intoNixOS:masterfrom
std::vector only once#13175Mic92 merged 1 commit intoNixOS:masterfrom
Conversation
I can't find a good way to benchmark in isolation from the git cache, but common sense dictates that creating (and destroying) a 131KiB std::vector for each regular file from the archive imposes quite a significant overhead regardless of the IO bound git cache. AFAICT there is no reason to keep a copy of the data since it always gets fed into the sink and there are no coroutines/threads in sight.
Member
|
Don't see a good reason. |
Contributor
Author
|
For reference: A simple patch for ad-hoc measurements: diff --git a/src/libfetchers/tarball.cc b/src/libfetchers/tarball.cc
index 1bd7e3e59..c5934569d 100644
--- a/src/libfetchers/tarball.cc
+++ b/src/libfetchers/tarball.cc
@@ -10,6 +10,8 @@
#include "nix/store/store-api.hh"
#include "nix/fetchers/git-utils.hh"
+#include <chrono>
+
namespace nix::fetchers {
DownloadFileResult downloadFile(
@@ -171,8 +173,12 @@ static DownloadTarballResult downloadTarball_(
: TarArchive{*source};
auto tarballCache = getTarballCache();
auto parseSink = tarballCache->getFileSystemObjectSink();
+ std::chrono::steady_clock::time_point begin = std::chrono::steady_clock::now();
auto lastModified = unpackTarfileToSink(archive, *parseSink);
auto tree = parseSink->flush();
+ std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now();
+ debug("time in unpackTarfileToSink: %s us", std::chrono::duration_cast<std::chrono::microseconds>(end - begin).count());
act.reset();For the cases when the cache is not empty fetching new nixpkgs revisions (not cached fully) yield in the ballpark of ~150ms improvement (out of ~7s) for .zip tarball input pretty consistently on my machine. |
Member
|
Thanks! Yes I was not intentionally reallocating from me. Thanks for finding! |
mergify bot
added a commit
that referenced
this pull request
Jul 30, 2025
…3175 libutil/tarfile: Create the scratch `std::vector` only once (backport #13175)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
AFAICT there is no reason to keep a copy of the data since it always gets fed into the sink and there are no coroutines/threads in sight.
I can't find a good way to benchmark in isolation from the git cache, but common sense dictates that creating (and destroying) a 131KiB
std::vectorfor each 131KiB chunk of a regular file from the archive imposes quite a significant overhead regardless of the IO bound git cache.cc @edolstra git blame points me to #9485 for when this was first introduced. Since then code was moved quite a bit by @Ericson2314. Is there some reason this was done this way and stuff just got lost during refactorings?
Context
Should help a bit with #10683
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.