lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

libstore: remove an always-defaulted argument

Browse source 
Change-Id: I3c7f17d5492a16bb54480fa1aa384b96fba72d61
This commit is contained in:
eldritch horrors 2024-07-20 21:05:19 +02:00
parent 58a91d70c9
commit 7bf1aff44a
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/libstore/build/worker.cc
View file

@ -205,7 +205,7 @@ void Worker::childStarted(GoalPtr goal, const std::set<int> & fds,
} }
void Worker::childTerminated(Goal * goal, bool wakeSleepers) void Worker::childTerminated(Goal * goal)
{ {
auto i = std::find_if(children.begin(), children.end(), auto i = std::find_if(children.begin(), children.end(),
[&](const Child & child) { return child.goal2 == goal; }); [&](const Child & child) { return child.goal2 == goal; });
@ -228,16 +228,13 @@ void Worker::childTerminated(Goal * goal, bool wakeSleepers)
children.erase(i); children.erase(i);
if (wakeSleepers) { /* Wake up goals waiting for a build slot. */
for (auto & j : wantingToBuild) {
/* Wake up goals waiting for a build slot. */ GoalPtr goal = j.lock();
for (auto & j : wantingToBuild) { if (goal) wakeUp(goal);
GoalPtr goal = j.lock();
if (goal) wakeUp(goal);
}
wantingToBuild.clear();
} }
wantingToBuild.clear();
} }

7
src/libstore/build/worker.hh
View file

@ -223,12 +223,9 @@ public:
bool inBuildSlot, bool respectTimeouts); bool inBuildSlot, bool respectTimeouts);
/** /**
* Unregisters a running child process. `wakeSleepers` should be * Unregisters a running child process.
* false if there is no sense in waking up goals that are sleeping
* because they can't run yet (e.g., there is no free build slot,
* or the hook would still say `postpone`).
*/ */
void childTerminated(Goal * goal, bool wakeSleepers = true); void childTerminated(Goal * goal);
/** /**
* Put `goal` to sleep until a build slot becomes available (which * Put `goal` to sleep until a build slot becomes available (which