diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-03-16 20:22:34 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-03-16 20:35:59 +0100 |
| commit | 48662d151bdf4a38670897beacea9d1bd750376a (patch) | |
| tree | 9da5e14cf7dbea4ca7653de1774ffcc5673f3ef4 /src/libstore/local-store.hh | |
| parent | 3e6b194d78024373c2320f31f4ba0de3d0658b83 (diff) | |
Reduce substitution memory consumption
copyStorePath() now pipes the output of srcStore->narFromPath()
directly into dstStore->addToStore(). The sink used by the former is
converted into a source usable by the latter using
boost::coroutine2. This is based on [1].
This reduces the maximum resident size of
$ nix build --store ~/my-nix/ /nix/store/b0zlxla7dmy1iwc3g459rjznx59797xy-binutils-2.28.1 --substituters file:///tmp/binary-cache-xz/ --no-require-sigs
from 418592 KiB to 53416 KiB. (The previous commit also reduced the
runtime from ~4.2s to ~3.4s, not sure why.) A further improvement will
be to download files into a Sink.
[1] https://github.com/NixOS/nix/compare/master...Mathnerd314:dump-fix-coroutine#diff-dcbcac55a634031f9cc73707da6e4b18
Issue #1969.
Diffstat (limited to 'src/libstore/local-store.hh')
| -rw-r--r-- | src/libstore/local-store.hh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh index bbd50e1c1..0d6c17659 100644 --- a/src/libstore/local-store.hh +++ b/src/libstore/local-store.hh @@ -143,7 +143,7 @@ public: void querySubstitutablePathInfos(const PathSet & paths, SubstitutablePathInfos & infos) override; - void addToStore(const ValidPathInfo & info, const ref<std::string> & nar, + void addToStore(const ValidPathInfo & info, Source & source, RepairFlag repair, CheckSigsFlag checkSigs, std::shared_ptr<FSAccessor> accessor) override; |