Revert "LocalStore::addToStoreFromDump copy in chunks"

This reverts commit 592851fb67. We don't
need this extra feature anymore
This commit is contained in:
John Ericson 2020-07-15 23:19:41 +00:00
parent bc109648c4
commit 5602637d9e
3 changed files with 15 additions and 31 deletions

View file

@ -1037,7 +1037,7 @@ StorePath LocalStore::addToStore(const string & name, const Path & _srcPath,
FileIngestionMethod method, HashType hashAlgo, PathFilter & filter, RepairFlag repair) FileIngestionMethod method, HashType hashAlgo, PathFilter & filter, RepairFlag repair)
{ {
Path srcPath(absPath(_srcPath)); Path srcPath(absPath(_srcPath));
auto source = sinkToSource([&](Sink & sink, size_t & wanted) { auto source = sinkToSource([&](Sink & sink) {
if (method == FileIngestionMethod::Recursive) if (method == FileIngestionMethod::Recursive)
dumpPath(srcPath, sink, filter); dumpPath(srcPath, sink, filter);
else else

View file

@ -165,43 +165,35 @@ size_t StringSource::read(unsigned char * data, size_t len)
#endif #endif
std::unique_ptr<Source> sinkToSource( std::unique_ptr<Source> sinkToSource(
std::function<void(Sink &, size_t &)> fun, std::function<void(Sink &)> fun,
std::function<void()> eof) std::function<void()> eof)
{ {
struct SinkToSource : Source struct SinkToSource : Source
{ {
typedef boost::coroutines2::coroutine<std::basic_string<uint8_t>> coro_t; typedef boost::coroutines2::coroutine<std::string> coro_t;
std::function<void(Sink &, size_t &)> fun; std::function<void(Sink &)> fun;
std::function<void()> eof; std::function<void()> eof;
std::optional<coro_t::pull_type> coro; std::optional<coro_t::pull_type> coro;
bool started = false; bool started = false;
/* It would be nicer to have the co-routines have both args and a SinkToSource(std::function<void(Sink &)> fun, std::function<void()> eof)
return value, but unfortunately that was removed from Boost's
implementation for some reason, so we use some extra state instead.
*/
size_t wanted = 0;
SinkToSource(std::function<void(Sink &, size_t &)> fun, std::function<void()> eof)
: fun(fun), eof(eof) : fun(fun), eof(eof)
{ {
} }
std::basic_string<uint8_t> cur; std::string cur;
size_t pos = 0; size_t pos = 0;
size_t read(unsigned char * data, size_t len) override size_t read(unsigned char * data, size_t len) override
{ {
wanted = len < cur.size() ? 0 : len - cur.size(); if (!coro)
if (!coro) {
coro = coro_t::pull_type([&](coro_t::push_type & yield) { coro = coro_t::pull_type([&](coro_t::push_type & yield) {
LambdaSink sink([&](const uint8_t * data, size_t len) { LambdaSink sink([&](const unsigned char * data, size_t len) {
if (len) yield(std::basic_string<uint8_t> { data, len }); if (len) yield(std::string((const char *) data, len));
}); });
fun(sink, wanted); fun(sink);
}); });
}
if (!*coro) { eof(); abort(); } if (!*coro) { eof(); abort(); }
@ -211,10 +203,11 @@ std::unique_ptr<Source> sinkToSource(
pos = 0; pos = 0;
} }
auto numCopied = cur.copy(data, len, pos); auto n = std::min(cur.size() - pos, len);
pos += numCopied; memcpy(data, (unsigned char *) cur.data() + pos, n);
pos += n;
return numCopied; return n;
} }
}; };

View file

@ -273,19 +273,10 @@ struct ChainSource : Source
/* Convert a function that feeds data into a Sink into a Source. The /* Convert a function that feeds data into a Sink into a Source. The
Source executes the function as a coroutine. */ Source executes the function as a coroutine. */
std::unique_ptr<Source> sinkToSource( std::unique_ptr<Source> sinkToSource(
std::function<void(Sink &, size_t &)> fun,
std::function<void()> eof = []() {
throw EndOfFile("coroutine has finished");
});
static inline std::unique_ptr<Source> sinkToSource(
std::function<void(Sink &)> fun, std::function<void(Sink &)> fun,
std::function<void()> eof = []() { std::function<void()> eof = []() {
throw EndOfFile("coroutine has finished"); throw EndOfFile("coroutine has finished");
}) });
{
return sinkToSource([fun](Sink & s, size_t & _) { fun(s); }, eof);
}
void writePadding(size_t len, Sink & sink); void writePadding(size_t len, Sink & sink);