From bbdf08bc0facb5157a10c794712dae7e5902be03 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 31 Aug 2017 16:02:36 +0200
Subject: [PATCH] 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 ++++++++++++
src/libstore/misc.cc | 2 ++
2 files changed, 14 insertions(+)
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 39f6128aa..ce41752e6 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};
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index 8fa84d3a2..a82aa4e9c 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -107,6 +107,8 @@ void Store::queryMissing(const PathSet & targets,
PathSet & willBuild_, PathSet & willSubstitute_, PathSet & unknown_,
unsigned long long & downloadSize_, unsigned long long & narSize_)
{
+ Activity act(*logger, lvlDebug, actUnknown, "querying info about missing paths");
+
downloadSize_ = narSize_ = 0;
ThreadPool pool;
--
GitLab