about summary refs log tree commit diff
path: root/src/libutil/local.mk
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2018-03-16T19·22+0100
committerEelco Dolstra <edolstra@gmail.com>2018-03-16T19·35+0100
commit48662d151bdf4a38670897beacea9d1bd750376a (patch)
tree9da5e14cf7dbea4ca7653de1774ffcc5673f3ef4 /src/libutil/local.mk
parent3e6b194d78024373c2320f31f4ba0de3d0658b83 (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/libutil/local.mk')
-rw-r--r--src/libutil/local.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libutil/local.mk b/src/libutil/local.mk
index 5fc2aab569da..824f48fbfc9f 100644
--- a/src/libutil/local.mk
+++ b/src/libutil/local.mk
@@ -6,7 +6,7 @@ libutil_DIR := $(d)
 
 libutil_SOURCES := $(wildcard $(d)/*.cc)
 
-libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS)
+libutil_LDFLAGS = $(LIBLZMA_LIBS) -lbz2 -pthread $(OPENSSL_LIBS) $(LIBBROTLI_LIBS) -lboost_context
 
 libutil_LIBS = libformat