wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-07 01:51:47 +02:00
Code Activity

Progress indicator: Unify "copying" and "substituting"

Browse source 
They're the same thing after all.

Example:

  $ nix build --store local?root=/tmp/nix nixpkgs.firefox-unwrapped
  [0/1 built, 49/98 copied, 16.3/92.8 MiB DL, 55.8/309.2 MiB copied] downloading 'https://cache.nixos.org/nar/0pl9li1jigcj2dany47hpmn0r3r48wc4nz48v5mqhh426lgz3bz6.nar.xz'
This commit is contained in:
Eelco Dolstra 2017-08-14 22:12:36 +02:00
parent c36467ad2e
commit 0e0dcf2c7e
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
4 changed files with 24 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/libstore/build.cc
View file

@ -207,7 +207,7 @@ struct MaintainCount
{
T & counter;
T delta;
MaintainCount(T & counter, T delta) : counter(counter), delta(delta) { counter += delta; }
MaintainCount(T & counter, T delta = 1) : counter(counter), delta(delta) { counter += delta; }
~MaintainCount() { counter -= delta; }
};
@ -256,6 +256,7 @@ private:
public:
const Activity act;
const Activity actSubstitutions;
/* Set if at least one derivation had a BuildError (i.e. permanent
failure). */
@ -268,6 +269,8 @@ public:
std::unique_ptr<HookInstance> hook;
uint64_t expectedSubstitutions = 0;
uint64_t doneSubstitutions = 0;
uint64_t expectedDownloadSize = 0;
uint64_t doneDownloadSize = 0;
uint64_t expectedNarSize = 0;
@ -334,6 +337,7 @@ public:
void updateProgress()
{
actSubstitutions.progress(doneSubstitutions, expectedSubstitutions + doneSubstitutions);
logger->event(evSetExpected, act, actDownload, expectedDownloadSize + doneDownloadSize);
logger->event(evSetExpected, act, actCopyPath, expectedNarSize + doneNarSize);
}
@ -3328,7 +3332,8 @@ private:
storePath when doing a repair. */
Path destPath;
std::unique_ptr<MaintainCount<uint64_t>> maintainExpectedNar, maintainExpectedDownload;
std::unique_ptr<MaintainCount<uint64_t>> maintainExpectedSubstitutions,
maintainExpectedNar, maintainExpectedDownload;
typedef void (SubstitutionGoal::*GoalState)();
GoalState state;
@ -3364,7 +3369,6 @@ public:
void amDone(ExitCode result) override
{
logger->event(evSubstitutionFinished, act, result == ecSuccess);
Goal::amDone(result);
}
};
@ -3379,7 +3383,7 @@ SubstitutionGoal::SubstitutionGoal(const Path & storePath, Worker & worker, Repa
state = &SubstitutionGoal::init;
name = (format("substitution of '%1%'") % storePath).str();
trace("created");
logger->event(evSubstitutionCreated, act, storePath);
maintainExpectedSubstitutions = std::make_unique<MaintainCount<uint64_t>>(worker.expectedSubstitutions);
}
@ -3527,8 +3531,6 @@ void SubstitutionGoal::tryToRun()
printInfo(format("fetching path '%1%'...") % storePath);
logger->event(evSubstitutionStarted, act);
outPipe.create();
promise = std::promise<void>();
@ -3576,6 +3578,9 @@ void SubstitutionGoal::finished()
printMsg(lvlChatty,
format("substitution of path '%1%' succeeded") % storePath);
maintainExpectedSubstitutions.reset();
worker.doneSubstitutions++;
if (maintainExpectedDownload) {
auto fileSize = maintainExpectedDownload->delta;
maintainExpectedDownload.reset();
@ -3610,6 +3615,7 @@ static bool working = false;
Worker::Worker(LocalStore & store)
: act(actRealise)
, actSubstitutions(actCopyPaths)
, store(store)
{
/* Debugging: prevent recursive workers. */
@ -3632,6 +3638,7 @@ Worker::~Worker()
their destructors). */
topGoals.clear();
assert(expectedSubstitutions == 0);
assert(expectedDownloadSize == 0);
assert(expectedNarSize == 0);
}