This commit is contained in:
Eelco Dolstra 2015-08-10 11:26:30 +02:00
parent f21b88e388
commit 6a1c950e94
2 changed files with 120 additions and 110 deletions

View file

@ -31,6 +31,25 @@ void State::dispatcher()
while (true) { while (true) {
printMsg(lvlDebug, "dispatcher woken up"); printMsg(lvlDebug, "dispatcher woken up");
auto sleepUntil = doDispatch();
/* Sleep until we're woken up (either because a runnable build
is added, or because a build finishes). */
{
std::unique_lock<std::mutex> lock(dispatcherMutex);
printMsg(lvlDebug, format("dispatcher sleeping for %1%s") %
std::chrono::duration_cast<std::chrono::seconds>(sleepUntil - std::chrono::system_clock::now()).count());
dispatcherWakeup.wait_until(lock, sleepUntil);
nrDispatcherWakeups++;
}
}
printMsg(lvlError, "dispatcher exits");
}
system_time State::doDispatch()
{
auto sleepUntil = system_time::max(); auto sleepUntil = system_time::max();
bool keepGoing; bool keepGoing;
@ -142,18 +161,7 @@ void State::dispatcher()
} while (keepGoing); } while (keepGoing);
/* Sleep until we're woken up (either because a runnable build return sleepUntil;
is added, or because a build finishes). */
{
std::unique_lock<std::mutex> lock(dispatcherMutex);
printMsg(lvlDebug, format("dispatcher sleeping for %1%s") %
std::chrono::duration_cast<std::chrono::seconds>(sleepUntil - std::chrono::system_clock::now()).count());
dispatcherWakeup.wait_until(lock, sleepUntil);
nrDispatcherWakeups++;
}
}
printMsg(lvlError, "dispatcher exits");
} }

View file

@ -289,6 +289,8 @@ private:
/* The thread that selects and starts runnable builds. */ /* The thread that selects and starts runnable builds. */
void dispatcher(); void dispatcher();
system_time doDispatch();
void wakeDispatcher(); void wakeDispatcher();
void builder(Step::ptr step, Machine::ptr machine, std::shared_ptr<MaintainCount> reservation); void builder(Step::ptr step, Machine::ptr machine, std::shared_ptr<MaintainCount> reservation);