wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 05:21:16 +02:00
Code Activity

LocalStore::addToStoreFromDump copy in chunks

Browse source 
Rather than copying byte-by-byte, we let the coroutine know how much
data we would like it to send back to us.
This commit is contained in:
John Ericson 2020-07-11 23:40:49 +00:00
parent 9de96ef7d4
commit 592851fb67
4 changed files with 40 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/libstore/local-store.cc
View file

@ -1036,11 +1036,13 @@ void LocalStore::addToStore(const ValidPathInfo & info, Source & source,
StorePath LocalStore::addToStoreFromDump(Source & dump, const string & name,
FileIngestionMethod method, HashType hashAlgo, RepairFlag repair)
{
return addToStoreCommon(name, method, hashAlgo, repair, [&](auto & sink) {
return addToStoreCommon(name, method, hashAlgo, repair, [&](auto & sink, size_t & wanted) {
while (1) {
uint8_t buf[1];
auto n = dump.read(buf, 1);
constexpr size_t bufSize = 1024;
uint8_t buf[bufSize];
auto n = dump.read(buf, std::min(wanted, bufSize));
sink(buf, n);
// when control is yielded back to us wanted will be updated.
}
});
}
@ -1051,7 +1053,7 @@ StorePath LocalStore::addToStore(const string & name, const Path & _srcPath,
{
Path srcPath(absPath(_srcPath));
return addToStoreCommon(name, method, hashAlgo, repair, [&](auto & sink) {
return addToStoreCommon(name, method, hashAlgo, repair, [&](auto & sink, size_t & _) {
if (method == FileIngestionMethod::Recursive)
dumpPath(srcPath, sink, filter);
else
@ -1062,7 +1064,7 @@ StorePath LocalStore::addToStore(const string & name, const Path & _srcPath,
StorePath LocalStore::addToStoreCommon(
const string & name, FileIngestionMethod method, HashType hashAlgo, RepairFlag repair,
std::function<void(Sink &)> demux)
std::function<void(Sink &, size_t &)> demux)
{
/* For computing the NAR hash. */
auto sha256Sink = std::make_unique<HashSink>(htSHA256);
@ -1083,7 +1085,7 @@ StorePath LocalStore::addToStoreCommon(
bool inMemory = true;
std::string nar;
auto source = sinkToSource([&](Sink & sink) {
auto source = sinkToSource([&](Sink & sink, size_t & wanted) {
LambdaSink sink2([&](const unsigned char * buf, size_t len) {
(*sha256Sink)(buf, len);
if (hashSink) (*hashSink)(buf, len);
@ -1101,7 +1103,7 @@ StorePath LocalStore::addToStoreCommon(
if (!inMemory) sink(buf, len);
});
demux(sink2);
demux(sink2, wanted);
});
std::unique_ptr<AutoDelete> delTempDir;

2
src/libstore/local-store.hh
View file

@ -292,7 +292,7 @@ private:
StorePath addToStoreCommon(
const string & name, FileIngestionMethod method, HashType hashAlgo, RepairFlag repair,
std::function<void(Sink &)> demux);
std::function<void(Sink &, size_t &)> demux);
Path getRealStoreDir() override { return realStoreDir; }