Ticket #6897: device-read-buffer-fix-v1.patch

mythtv/libs/libmythtv/DeviceReadBuffer.cpp

@@ -156 +156 @@
 void DeviceReadBuffer::SetPaused(bool val)
 {
     QMutexLocker locker(&lock);
-    paused = val;
+    paused.fetchAndStoreOrdered(val);
     if (val)
         pauseWait.wakeAll();
     else
@@ -165 +165 @@
 
 bool DeviceReadBuffer::IsPaused(void) const
 {
-    QMutexLocker locker(&lock);
     return paused;
 }
 
@@ -332 +331 @@
     return false;
 #else
     bool retval = true;
+
+    unsigned int elapsed = 0;
+    unsigned int timeout = 2500 /* ms */;
     MythTimer timer;
     timer.start();
 
@@ -371 +373 @@
         }
         else //  ret == 0
         {
-            if (timer.elapsed() > 2500 /*ms*/)
+            elapsed += timer.restart();
+            if (elapsed > timeout)
             {
-                VERBOSE(VB_RECORD, LOC_ERR + "Poll giving up");
-                QMutexLocker locker(&lock);
-                error = true;
-                return true;
+                timeout = elapsed + 5000 /* ms */;
+
+                VERBOSE(VB_RECORD, LOC_ERR + QString("No data seen for %1 msecs.")
+                                             .arg(elapsed));
             }
         }
     }

mythtv/libs/libmythtv/DeviceReadBuffer.h

@@ -11 +11 @@
 #include <qwaitcondition.h>
 #include <qstring.h>
 
+#include <QAtomicInt>
+
 #include "util.h"
 
 class ReaderPausedCB
@@ -86 +88 @@
     bool             eof;
     mutable bool     error;
     bool             request_pause;
-    bool             paused;
+    QAtomicInt       paused;
     bool             using_poll;
 
     size_t           size;