From 71eb84d5f483af8d22402de3d2ec70b08b5802d3 Mon Sep 17 00:00:00 2001
From: "Matthias P. Braendli" <matthias.braendli@mpb.li>
Date: Fri, 5 Jun 2015 09:15:56 +0200
Subject: Fix intermittent underruns after a restart

When using UHD without synchronous=1:
After a modulator restart, the input ZMQ buffer is nearly empty, and
the modulator actually gets blocked by the ThreadsafeQueue. This is
visible by looking at the time deltas printed in the debugging code.

This commit adds a minimal form of prebuffering (10 ETI frames) to the
ZeroMQ input, and removes the useless minimum required size for the
ThreadsafeQueue.

In synchronous=1, the issue is not visible because the TIST defines the
time to transmit, which will cause the ZMQ buffer to fill.
---
 src/ThreadsafeQueue.h | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

(limited to 'src/ThreadsafeQueue.h')

diff --git a/src/ThreadsafeQueue.h b/src/ThreadsafeQueue.h
index 78e9ef0..e5e83ef 100644
--- a/src/ThreadsafeQueue.h
+++ b/src/ThreadsafeQueue.h
@@ -38,25 +38,14 @@
  * that pushes elements into the queue, and one consumer that
  * retrieves the elements.
  *
- * The queue can make the consumer block until enough elements
- * are available.
+ * The queue can make the consumer block until an element
+ * is available.
  */
 
 template<typename T>
 class ThreadsafeQueue
 {
 public:
-    /* Create a new queue without any minimum required
-     * fill before it is possible to pop an element
-     */
-    ThreadsafeQueue() : the_required_size(1) {}
-
-    /* Create a queue where it has to contain at least
-     * required_size elements before pop is possible
-     */
-    ThreadsafeQueue(size_t required_size) : the_required_size(required_size) {
-    }
-
     /* Push one element into the queue, and notify another thread that
      * might be waiting.
      *
@@ -87,14 +76,14 @@ public:
 
     size_t size() const
     {
+        boost::mutex::scoped_lock lock(the_mutex);
         return the_queue.size();
     }
 
     bool try_pop(T& popped_value)
     {
         boost::mutex::scoped_lock lock(the_mutex);
-        if(the_queue.size() < the_required_size)
-        {
+        if (the_queue.empty()) {
             return false;
         }
 
@@ -103,10 +92,10 @@ public:
         return true;
     }
 
-    void wait_and_pop(T& popped_value)
+    void wait_and_pop(T& popped_value, size_t prebuffering = 1)
     {
         boost::mutex::scoped_lock lock(the_mutex);
-        while(the_queue.size() < the_required_size) {
+        while (the_queue.size() < prebuffering) {
             the_condition_variable.wait(lock);
         }
 
@@ -118,7 +107,6 @@ private:
     std::queue<T> the_queue;
     mutable boost::mutex the_mutex;
     boost::condition_variable the_condition_variable;
-    size_t the_required_size;
 };
 
 #endif
-- 
cgit v1.2.3