aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-07-21 17:40:40 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-07-21 17:50:39 +0200
commitd57981bac488e5928218e0eaeae58bd817c74727 (patch)
tree9c2cc5a3dce844089c58892bf3cbf7bb300ef115
parent6f70fcd1c574e0d4900b5d0d55d22d6053e9826c (diff)
Store::queryMissing(): Use a thread pool
For one particular NixOS configuration, this cut the runtime of "nix-store -r --dry-run" from 6m51s to 3.4s. It also fixes a bug in the size calculation that was causing certain paths to be counted twice, e.g. before: these paths will be fetched (1249.98 MiB download, 2995.74 MiB unpacked): and after: these paths will be fetched (1219.56 MiB download, 2862.17 MiB unpacked):
-rw-r--r--src/libstore/misc.cc189
1 files changed, 104 insertions, 85 deletions
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index 2e0774f7e..da654ba0d 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -72,116 +72,135 @@ void Store::computeFSClosure(const Path & path,
void Store::queryMissing(const PathSet & targets,
- PathSet & willBuild, PathSet & willSubstitute, PathSet & unknown,
- unsigned long long & downloadSize, unsigned long long & narSize)
+ PathSet & willBuild_, PathSet & willSubstitute_, PathSet & unknown_,
+ unsigned long long & downloadSize_, unsigned long long & narSize_)
{
- downloadSize = narSize = 0;
+ downloadSize_ = narSize_ = 0;
- PathSet todo(targets.begin(), targets.end()), done;
-
- /* Getting substitute info has high latency when using the binary
- cache substituter. Thus it's essential to do substitute
- queries in parallel as much as possible. To accomplish this
- we do the following:
+ ThreadPool pool;
- - For all paths still to be processed (‘todo’), we add all
- paths for which we need info to the set ‘query’. For an
- unbuilt derivation this is the output paths; otherwise, it's
- the path itself.
+ struct State
+ {
+ PathSet done;
+ PathSet & unknown, & willSubstitute, & willBuild;
+ unsigned long long & downloadSize;
+ unsigned long long & narSize;
+ };
- - We get info about all paths in ‘query’ in parallel.
+ struct DrvState
+ {
+ size_t left;
+ bool done = false;
+ PathSet outPaths;
+ DrvState(size_t left) : left(left) { }
+ };
- - We process the results and add new items to ‘todo’ if
- necessary. E.g. if a path is substitutable, then we need to
- get info on its references.
+ Sync<State> state_(State{PathSet(), unknown_, willSubstitute_, willBuild_, downloadSize_, narSize_});
- - Repeat until ‘todo’ is empty.
- */
+ std::function<void(Path)> doPath;
- while (!todo.empty()) {
+ auto mustBuildDrv = [&](const Path & drvPath, const Derivation & drv) {
+ {
+ auto state(state_.lock());
+ state->willBuild.insert(drvPath);
+ }
- PathSet query, todoDrv, todoNonDrv;
+ for (auto & i : drv.inputDrvs)
+ pool.enqueue(std::bind(doPath, makeDrvPathWithOutputs(i.first, i.second)));
+ };
- for (auto & i : todo) {
- if (done.find(i) != done.end()) continue;
- done.insert(i);
+ auto checkOutput = [&](
+ const Path & drvPath, ref<Derivation> drv, const Path & outPath, ref<Sync<DrvState>> drvState_)
+ {
+ if (drvState_->lock()->done) return;
- DrvPathWithOutputs i2 = parseDrvPathWithOutputs(i);
+ SubstitutablePathInfos infos;
+ querySubstitutablePathInfos({outPath}, infos);
- if (isDerivation(i2.first)) {
- if (!isValidPath(i2.first)) {
- // FIXME: we could try to substitute p.
- unknown.insert(i);
- continue;
+ if (infos.empty()) {
+ drvState_->lock()->done = true;
+ mustBuildDrv(drvPath, *drv);
+ } else {
+ {
+ auto drvState(drvState_->lock());
+ if (drvState->done) return;
+ assert(drvState->left);
+ drvState->left--;
+ drvState->outPaths.insert(outPath);
+ if (!drvState->left) {
+ for (auto & path : drvState->outPaths)
+ pool.enqueue(std::bind(doPath, path));
}
- Derivation drv = derivationFromPath(i2.first);
-
- PathSet invalid;
- for (auto & j : drv.outputs)
- if (wantOutput(j.first, i2.second)
- && !isValidPath(j.second.path))
- invalid.insert(j.second.path);
- if (invalid.empty()) continue;
-
- todoDrv.insert(i);
- if (settings.useSubstitutes && drv.substitutesAllowed())
- query.insert(invalid.begin(), invalid.end());
- }
-
- else {
- if (isValidPath(i)) continue;
- query.insert(i);
- todoNonDrv.insert(i);
}
}
+ };
- todo.clear();
+ doPath = [&](const Path & path) {
- SubstitutablePathInfos infos;
- querySubstitutablePathInfos(query, infos);
+ {
+ auto state(state_.lock());
+ if (state->done.count(path)) return;
+ state->done.insert(path);
+ }
- for (auto & i : todoDrv) {
- DrvPathWithOutputs i2 = parseDrvPathWithOutputs(i);
+ DrvPathWithOutputs i2 = parseDrvPathWithOutputs(path);
+
+ if (isDerivation(i2.first)) {
+ if (!isValidPath(i2.first)) {
+ // FIXME: we could try to substitute the derivation.
+ auto state(state_.lock());
+ state->unknown.insert(path);
+ return;
+ }
- // FIXME: cache this
Derivation drv = derivationFromPath(i2.first);
- PathSet outputs;
- bool mustBuild = false;
+ PathSet invalid;
+ for (auto & j : drv.outputs)
+ if (wantOutput(j.first, i2.second)
+ && !isValidPath(j.second.path))
+ invalid.insert(j.second.path);
+ if (invalid.empty()) return;
+
if (settings.useSubstitutes && drv.substitutesAllowed()) {
- for (auto & j : drv.outputs) {
- if (!wantOutput(j.first, i2.second)) continue;
- if (!isValidPath(j.second.path)) {
- if (infos.find(j.second.path) == infos.end())
- mustBuild = true;
- else
- outputs.insert(j.second.path);
- }
- }
+ auto drvState = make_ref<Sync<DrvState>>(DrvState(invalid.size()));
+ for (auto & output : invalid)
+ pool.enqueue(std::bind(checkOutput, i2.first, make_ref<Derivation>(drv), output, drvState));
} else
- mustBuild = true;
+ mustBuildDrv(i2.first, drv);
- if (mustBuild) {
- willBuild.insert(i2.first);
- todo.insert(drv.inputSrcs.begin(), drv.inputSrcs.end());
- for (auto & j : drv.inputDrvs)
- todo.insert(makeDrvPathWithOutputs(j.first, j.second));
- } else
- todoNonDrv.insert(outputs.begin(), outputs.end());
- }
+ } else {
- for (auto & i : todoNonDrv) {
- done.insert(i);
- SubstitutablePathInfos::iterator info = infos.find(i);
- if (info != infos.end()) {
- willSubstitute.insert(i);
- downloadSize += info->second.downloadSize;
- narSize += info->second.narSize;
- todo.insert(info->second.references.begin(), info->second.references.end());
- } else
- unknown.insert(i);
+ if (isValidPath(path)) return;
+
+ SubstitutablePathInfos infos;
+ querySubstitutablePathInfos({path}, infos);
+
+ if (infos.empty()) {
+ auto state(state_.lock());
+ state->unknown.insert(path);
+ return;
+ }
+
+ auto info = infos.find(path);
+ assert(info != infos.end());
+
+ {
+ auto state(state_.lock());
+ state->willSubstitute.insert(path);
+ state->downloadSize += info->second.downloadSize;
+ state->narSize += info->second.narSize;
+ }
+
+ for (auto & ref : info->second.references)
+ pool.enqueue(std::bind(doPath, ref));
}
- }
+ };
+
+ for (auto & path : targets)
+ pool.enqueue(std::bind(doPath, path));
+
+ pool.process();
}