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

Replace hasSubstitutes() with querySubstitutablePaths()

Browse source 
querySubstitutablePaths() takes a set of paths, so this greatly
reduces daemon <-> client latency.
This commit is contained in:
Eelco Dolstra 2012-07-11 17:52:18 -04:00
parent 58ef4d9a95
commit 09a6321aeb
8 changed files with 52 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -932,16 +932,24 @@ template<class T> T getIntLine(int fd)
}
bool LocalStore::hasSubstitutes(const Path & path)
PathSet LocalStore::querySubstitutablePaths(const PathSet & paths)
{
PathSet res;
foreach (Paths::iterator, i, substituters) {
if (res.size() == paths.size()) break;
RunningSubstituter & run(runningSubstituters[*i]);
startSubstituter(*i, run);
writeLine(run.to, "have\n" + path);
if (getIntLine<int>(run.from)) return true;
string s = "have ";
foreach (PathSet::const_iterator, i, paths)
if (res.find(*i) == res.end()) { s += *i; s += " "; }
writeLine(run.to, s);
while (true) {
Path path = readLine(run.from);
if (path == "") break;
res.insert(path);
}
}
return false;
return res;
}