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

hydra-queue-runner: Fix assertion failure

Browse source
This commit is contained in:
Eelco Dolstra 2015-06-22 10:59:07 +02:00
parent d744362e4a
commit 90a08db241
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -863,8 +863,8 @@ void State::dispatcher()
do { do {
/* Copy the currentJobs field of each machine. This is /* Copy the currentJobs field of each machine. This is
necessary to ensure that the sort comparator below is a necessary to ensure that the sort comparator below is
ordering. std::sort() can segfault if it isn't. */ an ordering. std::sort() can segfault if it isn't. */
struct MachineInfo struct MachineInfo
{ {
Machine::ptr machine; Machine::ptr machine;
@ -1203,7 +1203,10 @@ bool State::doBuildStep(std::shared_ptr<StoreAPI> store, Step::ptr step,
{ {
auto rdep_(rdep->state.lock()); auto rdep_(rdep->state.lock());
rdep_->deps.erase(step); rdep_->deps.erase(step);
if (rdep_->deps.empty()) runnable = true; /* Note: if the step has not finished
initialisation yet, it will be made runnable in
createStep(), if appropriate. */
if (rdep_->deps.empty() && rdep->created) runnable = true;
} }
if (runnable) makeRunnable(rdep); if (runnable) makeRunnable(rdep);