diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2018-03-21 22:56:02 +0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2018-03-21 23:10:40 +0100 |
commit | 47f7e5585bbb9a6acfaddda7327ba4eeb5b662c2 (patch) | |
tree | 9ef9057da8d91c8178f54161841bcc76d52ab7c1 /src/libstore/ssh-store.cc | |
parent | 92dfc223272083061d0c02d35efcad0a8bb9ba4d (diff) |
Make 'nix copy --from ssh://...' run in constant memory
For instance, this reduced the memory consumption of
$ nix copy --from ssh://localhost --to ~/my-nix /nix/store/1n7x0yv8vq6zi90hfmian84vdhd04bgp-blender-2.79a
from 632 MiB to 16 MiB.
Diffstat (limited to 'src/libstore/ssh-store.cc')
-rw-r--r-- | src/libstore/ssh-store.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc index 398408ea8..39205ae2c 100644 --- a/src/libstore/ssh-store.cc +++ b/src/libstore/ssh-store.cc @@ -63,29 +63,12 @@ private: }; }; - -class ForwardSource : public Source -{ - Source & readSource; - Sink & writeSink; -public: - ForwardSource(Source & readSource, Sink & writeSink) : readSource(readSource), writeSink(writeSink) {} - size_t read(unsigned char * data, size_t len) override - { - auto n = readSource.read(data, len); - writeSink(data, n); - return n; - } -}; - void SSHStore::narFromPath(const Path & path, Sink & sink) { auto conn(connections->get()); conn->to << wopNarFromPath << path; conn->processStderr(); - ParseSink ps; - auto fwd = ForwardSource(conn->from, sink); - parseDump(ps, fwd); + copyNAR(conn->from, sink); } ref<FSAccessor> SSHStore::getFSAccessor() |