From bbdf08bc0facb5157a10c794712dae7e5902be03 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 31 Aug 2017 16:02:36 +0200 Subject: Call queryMissing() prior to building Without this, substitute info is fetched sequentially, which is superslow. In the old UI (e.g. nix-build), we call printMissing(), which calls queryMissing(), thereby preheating the binary cache cache. But the new UI doesn't do that. --- src/libstore/build.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/libstore/build.cc') diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 39f6128aafd6..ce41752e6239 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -4166,10 +4166,20 @@ void Worker::markContentsGood(const Path & path) ////////////////////////////////////////////////////////////////////// +static void primeCache(Store & store, const PathSet & paths) +{ + PathSet willBuild, willSubstitute, unknown; + unsigned long long downloadSize, narSize; + store.queryMissing(paths, willBuild, willSubstitute, unknown, downloadSize, narSize); +} + + void LocalStore::buildPaths(const PathSet & drvPaths, BuildMode buildMode) { Worker worker(*this); + primeCache(*this, drvPaths); + Goals goals; for (auto & i : drvPaths) { DrvPathWithOutputs i2 = parseDrvPathWithOutputs(i); @@ -4220,6 +4230,8 @@ void LocalStore::ensurePath(const Path & path) /* If the path is already valid, we're done. */ if (isValidPath(path)) return; + primeCache(*this, {path}); + Worker worker(*this); GoalPtr goal = worker.makeSubstitutionGoal(path); Goals goals = {goal}; -- cgit 1.4.1