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

Eliminate some large string copying

Browse source
This commit is contained in:
Eelco Dolstra 2016-03-04 16:49:56 +01:00
parent ce113c32d2
commit 42bc395b63
5 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1415,9 +1415,9 @@ Path LocalStore::addToStore(const string & name, const Path & _srcPath,
if (recursive)
dumpPath(srcPath, sink, filter);
else
sink.s = readFile(srcPath);
sink.s = make_ref<std::string>(readFile(srcPath));
return addToStoreFromDump(sink.s, name, recursive, hashAlgo, repair);
return addToStoreFromDump(*sink.s, name, recursive, hashAlgo, repair);
}
@ -1442,14 +1442,14 @@ Path LocalStore::addTextToStore(const string & name, const string & s,
StringSink sink;
dumpString(s, sink);
auto hash = hashString(htSHA256, sink.s);
auto hash = hashString(htSHA256, *sink.s);
optimisePath(dstPath);
ValidPathInfo info;
info.path = dstPath;
info.narHash = hash;
info.narSize = sink.s.size();
info.narSize = sink.s->size();
info.references = references;
registerValidPath(info);
}