From 2392688a2d0146bfaaae6cb49628a4d820ba736e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Nov 2020 14:20:42 +0100 Subject: [PATCH] Move method --- src/libstore/build/worker.cc | 7 +++++++ src/libstore/build/worker.hh | 7 +------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/libstore/build/worker.cc b/src/libstore/build/worker.cc index 6c96a93bd..f1227a6a1 100644 --- a/src/libstore/build/worker.cc +++ b/src/libstore/build/worker.cc @@ -472,4 +472,11 @@ GoalPtr upcast_goal(std::shared_ptr subGoal) { return subGoal; } +void Worker::updateProgress() +{ + actDerivations.progress(doneBuilds, expectedBuilds + doneBuilds, runningBuilds, failedBuilds); + actSubstitutions.progress(doneSubstitutions, expectedSubstitutions + doneSubstitutions, runningSubstitutions, failedSubstitutions); + act.setExpected(actCopyPath, expectedNarSize + doneNarSize); +} + } diff --git a/src/libstore/build/worker.hh b/src/libstore/build/worker.hh index f00cc654b..b6b58d947 100644 --- a/src/libstore/build/worker.hh +++ b/src/libstore/build/worker.hh @@ -195,12 +195,7 @@ public: void markContentsGood(const StorePath & path); - void updateProgress() - { - actDerivations.progress(doneBuilds, expectedBuilds + doneBuilds, runningBuilds, failedBuilds); - actSubstitutions.progress(doneSubstitutions, expectedSubstitutions + doneSubstitutions, runningSubstitutions, failedSubstitutions); - act.setExpected(actCopyPath, expectedNarSize + doneNarSize); - } + void updateProgress(); }; }