From fa125b9b28bea25a4eeb4d39a71a481563127cb9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 1 Mar 2017 16:16:04 +0100 Subject: TeeSink: Pre-reserve string space When receiving a very large file, this can prevent the string from having tobe copied, which temporarily doubles memory consumption. --- src/nix-daemon/nix-daemon.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/nix-daemon/nix-daemon.cc') diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc index 174821884449..ab5826b0d1a7 100644 --- a/src/nix-daemon/nix-daemon.cc +++ b/src/nix-daemon/nix-daemon.cc @@ -583,12 +583,11 @@ static void performOp(ref store, bool trusted, unsigned int clientVe if (!trusted && dontCheckSigs) dontCheckSigs = false; - TeeSource tee(from); - ParseSink sink; - parseDump(sink, tee); + TeeSink tee(from); + parseDump(tee, tee.source); startWork(); - store->addToStore(info, tee.data, repair, dontCheckSigs, nullptr); + store->addToStore(info, tee.source.data, repair, dontCheckSigs, nullptr); stopWork(); break; } -- cgit 1.4.1