Ticket #8744: add_mutex_to_ChannelScannerSM.patch

libs/libmythtv/channelscan/channelscan_sm.h

@@ -236 +236 @@
     QMap<uint, bool>            currentEncryptionStatusChecked;
     QMap<uint64_t, QString>     defAuthorities;
 
+    /// Protects the transport lists
+    mutable QMutex    transportLock;
+
     /// Found Channel Info
     ChannelList       channelList;
     uint              channelsFound;

libs/libmythtv/channelscan/channelscan_sm.cpp

@@ -355 +355 @@
 
 void ChannelScanSM::HandlePMT(uint, const ProgramMapTable *pmt)
 {
+    QMutexLocker locker(&transportLock);
+
     VERBOSE(VB_CHANSCAN, LOC +
             QString("Got a Program Map Table for %1")
             .arg((*current).FriendlyName) + "\n" + pmt->toString());
@@ -365 +367 @@
 
 void ChannelScanSM::HandleVCT(uint, const VirtualChannelTable *vct)
 {
+    QMutexLocker locker(&transportLock);
+
     VERBOSE(VB_CHANSCAN, LOC + QString("Got a Virtual Channel Table for %1")
             .arg((*current).FriendlyName) + "\n" + vct->toString());
 
@@ -381 +385 @@
 
 void ChannelScanSM::HandleMGT(const MasterGuideTable *mgt)
 {
+    QMutexLocker locker(&transportLock);
+
     VERBOSE(VB_CHANSCAN, LOC + QString("Got the Master Guide for %1")
             .arg((*current).FriendlyName) + "\n" + mgt->toString());
 
@@ -412 +418 @@
         GetDTVSignalMonitor()->GetDVBStreamData()->SetVersionSDT(sdt->TSID(), -1, 0);
     }
 
+    QMutexLocker locker(&transportLock);
+
     uint id = sdt->OriginalNetworkID() << 16 | sdt->TSID();
     ts_scanned.insert(id);
 
@@ -428 +436 @@
 
 void ChannelScanSM::HandleNIT(const NetworkInformationTable *nit)
 {
+    QMutexLocker locker(&transportLock);
+
     VERBOSE(VB_CHANSCAN, LOC +
             QString("Got a Network Information Table for %1")
             .arg((*current).FriendlyName) + "\n" + nit->toString());
@@ -460 +470 @@
             DefaultAuthorityDescriptor authority(def_auth);
             ServiceListDescriptor services(serv_list);
 
+            QMutexLocker locker(&transportLock);
+
             for (uint j = 0; j < services.ServiceCount(); j++)
             {
                // If the default authority is given in the SDT this
@@ -496 +508 @@
             MPEGDescriptor::Find(parsed, DescriptorID::default_authority);
         if (def_auth)
         {
+            QMutexLocker locker(&transportLock);
+
             DefaultAuthorityDescriptor authority(def_auth);
             VERBOSE(VB_CHANSCAN, LOC + QString("found default authority(SDTo) "
                                                 "for service %1 %2 %3")
@@ -1511 +1525 @@
 
     if (0 == nextIt.offset() && nextIt != scanTransports.begin())
     {
-        // Add channel to scanned list and potentially check decryption
-        if (do_post_insertion && !UpdateChannelInfo(false))
-            return;
+        {
+            QMutexLocker locker(&transportLock);
+            // Add channel to scanned list and potentially check decryption
+            if (do_post_insertion && !UpdateChannelInfo(false))
+                return;
+        }
 
         // Stop signal monitor for previous transport
         signalMonitor->Stop();
@@ -1527 +1544 @@
 
     current = nextIt; // Increment current
 
+    QMutexLocker locker(&transportLock);
+
     if (current != scanTransports.end())
     {
         ScanTransport(current);