Unindent

src/hydra-queue-runner/dispatcher.cc

@@ -31,6 +31,25 @@ void State::dispatcher()
     while (true) {
         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();
 
     bool keepGoing;
@@ -142,18 +161,7 @@ void State::dispatcher()
 
     } 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");
 }
 
 

src/hydra-queue-runner/state.hh

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