diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-08-16T14·38+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-08-16T18·56+0200 |
| commit | 40bffe0a43e5f2f320c6bae7e39ea9c26906451d (patch) | |
| tree | 6e7d46a8b252201bd1ca0632e167f5e76ef0aab5 /src/libstore/build.cc | |
| parent | dff12b38f9d836fd0a58abc41286a9ad6b602aa5 (diff) | |
Progress indicator: Cleanup
Diffstat (limited to 'src/libstore/build.cc')
| -rw-r--r-- | src/libstore/build.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 257f02a49196..1a1fc1dee54d 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -335,8 +335,8 @@ public: { actDerivations.progress(doneBuilds, expectedBuilds + doneBuilds, runningBuilds, failedBuilds); actSubstitutions.progress(doneSubstitutions, expectedSubstitutions + doneSubstitutions, runningSubstitutions, failedSubstitutions); - logger->event(evSetExpected, act, actDownload, expectedDownloadSize + doneDownloadSize); - logger->event(evSetExpected, act, actCopyPath, expectedNarSize + doneNarSize); + act.setExpected(actDownload, expectedDownloadSize + doneDownloadSize); + act.setExpected(actCopyPath, expectedNarSize + doneNarSize); } }; @@ -1386,7 +1386,7 @@ void DerivationGoal::tryToBuild() bool buildLocally = buildMode != bmNormal || drv->willBuildLocally(); auto started = [&]() { - act = std::make_unique<Activity>(actBuild, fmt("building '%s'", drvPath)); + act = std::make_unique<Activity>(*logger, actBuild, fmt("building '%s'", drvPath)); mcRunningBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.runningBuilds); worker.updateProgress(); }; @@ -3257,7 +3257,7 @@ void DerivationGoal::flushLine() logTail.push_back(currentLogLine); if (logTail.size() > settings.logLines) logTail.pop_front(); } - logger->event(evBuildOutput, *act, currentLogLine); + act->progress(currentLogLine); currentLogLine = ""; currentLogLinePos = 0; } @@ -3647,9 +3647,9 @@ static bool working = false; Worker::Worker(LocalStore & store) - : act(actRealise) - , actDerivations(actBuilds) - , actSubstitutions(actCopyPaths) + : act(*logger, actRealise) + , actDerivations(*logger, actBuilds) + , actSubstitutions(*logger, actCopyPaths) , store(store) { /* Debugging: prevent recursive workers. */ |