Terrasync: don't busy wait when no requests are running.

diff --git a/simgear/scene/tsync/terrasync.cxx b/simgear/scene/tsync/terrasync.cxx
index afe89639df3ecf43e562fac53897f174a720a96b..48c0c64f80e76bf77742b985f185efdf3562ba4e 100644 (file)
--- a/simgear/scene/tsync/terrasync.cxx
+++ b/simgear/scene/tsync/terrasync.cxx
@@ -643,6 +643,12 @@ void SGTerraSync::SvnThread::runInternal()
         }
 
         _busy = anySlotBusy;
+        if (!anySlotBusy) {
+            // wait on the blocking deque here, otherwise we spin
+            // the loop very fast, since _http::update with no connections
+            // active returns immediately.
+            waitingTiles.waitOnNotEmpty();
+        }
     } // of thread running loop
 }
 

diff --git a/simgear/threads/SGQueue.hxx b/simgear/threads/SGQueue.hxx
index c4fab564c36d7f9df8ee865163952e11b6e7297c..7f49b5d97f73775a38ccc8bbe9814875d43525fb 100644 (file)
--- a/simgear/threads/SGQueue.hxx
+++ b/simgear/threads/SGQueue.hxx
@@ -386,6 +386,11 @@ public:
         return this->queue.size();
     }
 
+    void waitOnNotEmpty() {
+       SGGuard<SGMutex> g(mutex);
+       while (this->queue.empty())
+           not_empty.wait(mutex);
+    }
 private:
 
     /**