Merge branch 'master' of github.com:MythTV/mythtv

mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp

@@ -28,7 +28,6 @@
  */
 
 // C includes
-#include <pthread.h>
 #include <unistd.h>
 
 // C++ includes
@@ -164,8 +163,7 @@ ChannelScanSM::ChannelScanSM(
       // Misc
       channelsFound(999),
       currentInfo(NULL),
-      analogSignalHandler(new AnalogSignalHandler(this)),
-      scanner_thread_running(false)
+      analogSignalHandler(new AnalogSignalHandler(this))
 {
     inputname.detach();
 
@@ -1401,23 +1399,25 @@ V4LChannel *ChannelScanSM::GetV4LChannel(void)
 #endif
 }
 
-/** \fn ChannelScanSM::SpawnScanner(void*)
- *  \brief Thunk that allows scanner_thread pthread to
+/** \fn ScannerThread::run(void)
+ *  \brief Thunk that allows scannerThread thread to
  *         call ChannelScanSM::RunScanner().
  */
-void *ChannelScanSM::SpawnScanner(void *param)
+void ScannerThread::run(void)
 {
-    ChannelScanSM *scanner = (ChannelScanSM *)param;
-    scanner->RunScanner();
-    return NULL;
+    if (!m_parent)
+        return;
+
+    m_parent->RunScanner();
 }
 
 /** \fn ChannelScanSM::StartScanner(void)
  *  \brief Starts the ChannelScanSM event loop.
  */
 void ChannelScanSM::StartScanner(void)
 {
-    pthread_create(&scanner_thread, NULL, SpawnScanner, this);
+    scannerThread.SetParent(this);
+    scannerThread.start();
 }
 
 /** \fn ChannelScanSM::RunScanner(void)
@@ -1427,7 +1427,6 @@ void ChannelScanSM::RunScanner(void)
 {
     VERBOSE(VB_CHANSCAN, LOC + "ChannelScanSM::RunScanner -- begin");
 
-    scanner_thread_running = true;
     threadExit = false;
 
     while (!threadExit)
@@ -1437,7 +1436,6 @@ void ChannelScanSM::RunScanner(void)
 
         usleep(250);
     }
-    scanner_thread_running = false;
 
     VERBOSE(VB_CHANSCAN, LOC + "ChannelScanSM::RunScanner -- end");
 }
@@ -1669,8 +1667,8 @@ void ChannelScanSM::StopScanner(void)
 
     threadExit = true;
 
-    if (scanner_thread_running)
-        pthread_join(scanner_thread, NULL);
+    if (scannerThread.isRunning())
+        scannerThread.wait();
 
     if (signalMonitor)
         signalMonitor->Stop();

mythtv/libs/libmythtv/channelscan/channelscan_sm.h

@@ -30,14 +30,14 @@
 #ifndef SISCAN_H
 #define SISCAN_H
 
-#include <pthread.h>
-
 // Qt includes
 #include <QString>
 #include <QList>
 #include <QPair>
 #include <QMap>
 #include <QSet>
+#include <QObject>
+#include <QThread>
 
 // MythTV includes
 #include "frequencytables.h"
@@ -65,8 +65,9 @@ typedef QPair<transport_scan_items_it_t, ScannedChannelInfo*> ChannelListItem;
 typedef QList<ChannelListItem> ChannelList;
 
 class ChannelScanSM;
-class AnalogSignalHandler : public SignalMonitorListener
+class AnalogSignalHandler : public QObject, public SignalMonitorListener
 {
+    Q_OBJECT
   public:
     AnalogSignalHandler(ChannelScanSM *_siscan) : siscan(_siscan) { }
 
@@ -80,12 +81,24 @@ class AnalogSignalHandler : public SignalMonitorListener
     ChannelScanSM *siscan;
 };
 
+class ScannerThread : public QThread
+{
+    Q_OBJECT
+  public:
+    ScannerThread() : m_parent(NULL) {}
+    void SetParent(ChannelScanSM *parent) { m_parent = parent; }
+    void run(void);
+  private:
+    ChannelScanSM *m_parent;
+};
+
 class ChannelScanSM : public MPEGStreamListener,
                       public ATSCMainStreamListener,
                       public DVBMainStreamListener,
                       public DVBOtherStreamListener
 {
     friend class AnalogSignalHandler;
+    friend class ScannerThread;
 
   public:
     ChannelScanSM(
@@ -162,8 +175,6 @@ class ChannelScanSM : public MPEGStreamListener,
 
     /// \brief Called by SpawnScanner to run scanning thread
     void RunScanner(void);
-    /// \brief Thunk to call RunScanner from pthread
-    static void *SpawnScanner(void *param);
 
     bool HasTimedOut(void);
     void HandleActiveScan(void);
@@ -244,9 +255,7 @@ class ChannelScanSM : public MPEGStreamListener,
     // Analog Info
     AnalogSignalHandler *analogSignalHandler;
 
-    /// Scanner thread, runs ChannelScanSM::StartScanner()
-    pthread_t        scanner_thread;
-    bool             scanner_thread_running;
+    ScannerThread    scannerThread;
 };
 
 inline void ChannelScanSM::UpdateScanPercentCompleted(void)

mythtv/libs/libmythtv/dvbstreamhandler.cpp

@@ -102,7 +102,8 @@ DVBStreamHandler::DVBStreamHandler(const QString &dvb_device) :
 
     _pid_lock(QMutex::Recursive),
     _open_pid_filters(0),
-    _listener_lock(QMutex::Recursive)
+    _listener_lock(QMutex::Recursive),
+    _run(false)
 {
 }
 
@@ -210,7 +211,7 @@ void DVBStreamHandler::Start(void)
         _reader_thread.SetParent(this);
         _reader_thread.start();
 
-        if (_reader_thread.isRunning())
+        if (!_reader_thread.isRunning())
         {
             VERBOSE(VB_IMPORTANT, LOC_ERR + "Start: Failed to create thread.");
             return;
@@ -226,13 +227,15 @@ void DVBStreamHandler::Stop(void)
     {
         if (_device_read_buffer)
             _device_read_buffer->Stop();
+        _run = false;
         _reader_thread.wait();
     }
 }
 
 void DVBStreamHandler::Run(void)
 {
     _using_section_reader = !SupportsTSMonitoring() && _allow_section_reader;
+    _run = true;
 
     if (_using_section_reader)
         RunSR();
@@ -304,7 +307,7 @@ void DVBStreamHandler::RunTS(void)
     fd_set fd_select_set;
     FD_ZERO(        &fd_select_set);
     FD_SET (dvr_fd, &fd_select_set);
-    while (IsRunning() && !_error)
+    while (_run && !_error)
     {
         RetuneMonitor();
         UpdateFiltersFromStreamData();
@@ -411,7 +414,7 @@ void DVBStreamHandler::RunSR(void)
 
     VERBOSE(VB_RECORD, LOC + "RunSR(): begin");
 
-    while (IsRunning())
+    while (_run)
     {
         RetuneMonitor();
         UpdateFiltersFromStreamData();

mythtv/libs/libmythtv/dvbstreamhandler.h

@@ -134,6 +134,8 @@ class DVBStreamHandler : public ReaderPausedCB
     static QMutex                          _handlers_lock;
     static QMap<QString,DVBStreamHandler*> _handlers;
     static QMap<QString,uint>              _handlers_refcnt;
+
+    bool              _run;
 };
 
 #endif // _DVBSTREAMHANDLER_H_