Skip to content

fix(store): propagate cpu time from derivation trampoline #581

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CertainLach wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(store): propagate cpu time from derivation trampoline #581

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/libstore/build/derivation-trampoline-goal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#include <ranges>
#include <algorithm>
#include <chrono>

namespace nix {

Expand Down Expand Up @@ -166,6 +167,19 @@ Goal::Co DerivationTrampolineGoal::haveDerivation(StorePath drvPath, Derivation

trace("outer build done");

for (const auto & goal : concreteDrvGoals) {
const auto & inner = goal->buildResult;
buildResult.timesBuilt += inner.timesBuilt;
if (inner.startTime != 0 && (buildResult.startTime == 0 || inner.startTime < buildResult.startTime))
buildResult.startTime = inner.startTime;
buildResult.stopTime = std::max(buildResult.stopTime, inner.stopTime);
if (inner.cpuUser)
buildResult.cpuUser = buildResult.cpuUser.value_or(std::chrono::microseconds::zero()) + *inner.cpuUser;
if (inner.cpuSystem)
buildResult.cpuSystem =
buildResult.cpuSystem.value_or(std::chrono::microseconds::zero()) + *inner.cpuSystem;
}

if (nrFailed != 0) {
auto gi = std::ranges::find_if(concreteDrvGoals, [](const GoalPtr & goal) -> bool {
auto exitCode = goal->exitCode;
Expand Down