maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Make the import operation through the daemon much more efficient

Browse source 
(way fewer roundtrips) by allowing the client to send data in bigger
  chunks.
* Some refactoring.
This commit is contained in:
Eelco Dolstra 2011-12-16 19:44:13 +00:00
parent 78598d06f0
commit e0bd307802
6 changed files with 68 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/libutil/serialise.cc
View file

@ -23,8 +23,9 @@ void BufferedSink::operator () (const unsigned char * data, size_t len)
while (len) {
/* Optimisation: bypass the buffer if the data exceeds the
buffer size and there is no unflushed data. */
if (bufPos == 0 && len >= bufSize) {
buffer size. */
if (bufPos + len >= bufSize) {
flush();
write(data, len);
break;
}
@ -59,29 +60,37 @@ void FdSink::write(const unsigned char * data, size_t len)
}
void Source::operator () (unsigned char * data, size_t len)
{
while (len) {
size_t n = read(data, len);
data += n; len -= n;
}
}
BufferedSource::~BufferedSource()
{
if (buffer) delete[] buffer;
}
void BufferedSource::operator () (unsigned char * data, size_t len)
size_t BufferedSource::read(unsigned char * data, size_t len)
{
if (!buffer) buffer = new unsigned char[bufSize];
while (len) {
if (!bufPosIn) bufPosIn = read(buffer, bufSize);
if (!bufPosIn) bufPosIn = readUnbuffered(buffer, bufSize);
/* Copy out the data in the buffer. */
size_t n = len > bufPosIn - bufPosOut ? bufPosIn - bufPosOut : len;
memcpy(data, buffer + bufPosOut, n);
data += n; bufPosOut += n; len -= n;
if (bufPosIn == bufPosOut) bufPosIn = bufPosOut = 0;
}
/* Copy out the data in the buffer. */
size_t n = len > bufPosIn - bufPosOut ? bufPosIn - bufPosOut : len;
memcpy(data, buffer + bufPosOut, n);
bufPosOut += n;
if (bufPosIn == bufPosOut) bufPosIn = bufPosOut = 0;
return n;
}
size_t FdSource::read(unsigned char * data, size_t len)
size_t FdSource::readUnbuffered(unsigned char * data, size_t len)
{
ssize_t n;
do {
@ -94,6 +103,15 @@ size_t FdSource::read(unsigned char * data, size_t len)
}
size_t StringSource::read(unsigned char * data, size_t len)
{
if (pos == s.size()) throw EndOfFile("end of string reached");
size_t n = s.copy((char *) data, len, pos);
pos += n;
return n;
}
void writePadding(size_t len, Sink & sink)
{
if (len % 8) {