Ticket #13269: 13269-eit-debug2.patch

mythtv/libs/libmythtv/eitscanner.cpp

@@ -35 +35 @@
       exitThread(false),
       rec(NULL),                  activeScan(false),
       activeScanStopped(true),    activeScanTrigTime(0),
+      activeScanNextChanIndex(INT_MAX),
       cardnum(_cardnum)
 {
     QStringList langPref = iso639_get_language_list();
@@ -128 +129 @@
             }
 
             if (activeScanNextChan == activeScanChannels.end())
+            {
                 activeScanNextChan = activeScanChannels.begin();
+                activeScanNextChanIndex = 0;
+                LOG(VB_EIT, LOG_INFO,
+                    LOC_ID + QString("##EITScanner::run1 %1 of %2")
+                    .arg(activeScanNextChanIndex)
+                    .arg(activeScanChannels.size()));
+            }
 
             if (!(*activeScanNextChan).isEmpty())
             {
@@ -147 +155 @@
             activeScanNextTrig = MythDate::current()
                 .addSecs(activeScanTrigTime);
             ++activeScanNextChan;
+            if (activeScanChannels.size())
+            {
+                activeScanNextChanIndex =
+                    (activeScanNextChanIndex+1) % activeScanChannels.size();
+                LOG(VB_EIT, LOG_INFO,
+                    LOC_ID + QString("##EITScanner::run2 %1 of %2")
+                    .arg(activeScanNextChanIndex)
+                    .arg(activeScanChannels.size()));
+            }
 
             // 24 hours ago
 #if QT_VERSION < QT_VERSION_CHECK(5,8,0)
@@ -272 +289 @@
     // order when the backend is first started up.
     if (activeScanChannels.size())
     {
-        uint randomStart = random() % activeScanChannels.size();
-        activeScanNextChan = activeScanChannels.begin()+randomStart;
+        // Start on a random channel the first time.  For all
+        // subsequent times, start on the next channel.  This makes
+        // sure the immediately following channels get scanned in a
+        // timely manner if we keep erroring out on the previous
+        // channel.
+        if (activeScanNextChanIndex >= (uint)activeScanChannels.size())
+            activeScanNextChanIndex = random();
+        else
+            activeScanNextChanIndex += 1;
+        activeScanNextChanIndex =
+            activeScanNextChanIndex % activeScanChannels.size();
+        activeScanNextChan =
+            activeScanChannels.begin() + activeScanNextChanIndex;
+        LOG(VB_EIT, LOG_INFO,
+            LOC_ID + QString("##EITScanner::StartActiveScan1 %1 of %2")
+            .arg(activeScanNextChanIndex)
+            .arg(activeScanChannels.size()));
 
         activeScanNextTrig = MythDate::current();
         activeScanTrigTime = max_seconds_per_source;

mythtv/libs/libmythtv/eitscanner.h

@@ -65 +65 @@
     uint             activeScanTrigTime;
     QStringList      activeScanChannels;
     QStringList::iterator activeScanNextChan;
+    uint             activeScanNextChanIndex;
 
     uint             cardnum;
 

mythtv/libs/libmythtv/tv_rec.cpp

@@ -1050 +1050 @@
     {
         scanner->StopActiveScan();
         ClearFlags(kFlagEITScannerRunning, __FILE__, __LINE__);
+        eitScanStartTime = MythDate::current().addSecs(
+            eitCrawlIdleStart + eit_start_rand(eitTransportTimeout));
+        LOG(VB_CHANNEL, LOG_INFO,
+            LOC + QString("##TVRec::HandleStateChange0 %1")
+            .arg(eitScanStartTime.toString()));
     }
 
     // Handle different state transitions
@@ -1091 +1096 @@
     changeState = false;
 
     eitScanStartTime = MythDate::current();
+    LOG(VB_CHANNEL, LOG_INFO,
+        LOC + QString("##TVRec::HandleStateChange1a %1")
+        .arg(eitScanStartTime.toString()));
     if (scanner && (internalState == kState_None))
     {
         eitScanStartTime = eitScanStartTime.addSecs(
             eitCrawlIdleStart + eit_start_rand(eitTransportTimeout));
+        LOG(VB_CHANNEL, LOG_INFO,
+            LOC + QString("##TVRec::HandleStateChange1b %1")
+            .arg(eitScanStartTime.toString()));
     }
     else
+    {
         eitScanStartTime = eitScanStartTime.addYears(1);
+        LOG(VB_CHANNEL, LOG_INFO,
+            LOC + QString("##TVRec::HandleStateChange1c %1")
+            .arg(eitScanStartTime.toString()));
+    }
 }
 #undef TRANSITION
 #undef SET_NEXT
@@ -1293 +1309 @@
     ClearFlags(kFlagExitPlayer | kFlagFinishRecording, __FILE__, __LINE__);
 
     eitScanStartTime = MythDate::current();
+    LOG(VB_CHANNEL, LOG_INFO,
+        LOC + QString("##TVRec::run1a %1")
+        .arg(eitScanStartTime.toString()));
     // check whether we should use the EITScanner in this TVRec instance
     if (CardUtil::IsEITCapable(genOpt.inputtype) &&
         (!GetDTVChannel() || GetDTVChannel()->IsMaster()) &&
@@ -1301 +1320 @@
         scanner = new EITScanner(inputid);
         eitScanStartTime = eitScanStartTime.addSecs(
             eitCrawlIdleStart + eit_start_rand(eitTransportTimeout));
+        LOG(VB_CHANNEL, LOG_INFO,
+            LOC + QString("##TVRec::run1b %1")
+            .arg(eitScanStartTime.toString()));
     }
     else
+    {
         eitScanStartTime = eitScanStartTime.addYears(1);
+        LOG(VB_CHANNEL, LOG_INFO,
+            LOC + QString("##TVRec::run1c %1")
+            .arg(eitScanStartTime.toString()));
+    }
 
     while (HasFlags(kFlagRunMainLoop))
     {
@@ -1450 +1477 @@
                 LOG(VB_EIT, LOG_INFO, LOC +
                     "EIT scanning disabled for this input.");
                 eitScanStartTime = eitScanStartTime.addYears(1);
+                LOG(VB_CHANNEL, LOG_INFO,
+                    LOC + QString("##TVRec::run2a %1")
+                    .arg(eitScanStartTime.toString()));
             }
             else if (!get_use_eit(GetInputId()))
             {
                 LOG(VB_EIT, LOG_INFO, LOC +
                     "EIT scanning disabled for all sources on this input.");
                 eitScanStartTime = eitScanStartTime.addYears(1);
+                LOG(VB_CHANNEL, LOG_INFO,
+                    LOC + QString("##TVRec::run2b %1")
+                    .arg(eitScanStartTime.toString()));
             }
             else
             {
@@ -1475 +1508 @@
                     SetFlags(kFlagEITScannerRunning, __FILE__, __LINE__);
                     eitScanStartTime =
                         QDateTime::currentDateTime().addYears(1);
+                    LOG(VB_CHANNEL, LOG_INFO,
+                        LOC + QString("##TVRec::run3a %1")
+                        .arg(eitScanStartTime.toString()));
                 }
                 else
                 {
@@ -1483 +1519 @@
                             "because input %2 is busy")
                         .arg(inputid).arg(busy_input.inputid));
                     eitScanStartTime = eitScanStartTime.addSecs(300);
+                    LOG(VB_CHANNEL, LOG_INFO,
+                        LOC + QString("##TVRec::run3b %1")
+                        .arg(eitScanStartTime.toString()));
                 }
                 inputsLock.unlock();
             }
@@ -3590 +3629 @@
     {
         scanner->StopActiveScan();
         ClearFlags(kFlagEITScannerRunning, __FILE__, __LINE__);
+        eitScanStartTime = MythDate::current().addSecs(
+            eitCrawlIdleStart + eit_start_rand(eitTransportTimeout));
+        LOG(VB_CHANNEL, LOG_INFO,
+            LOC + QString("##TVRec::TVRec::TuningShutdowns1 %1")
+            .arg(eitScanStartTime.toString()));
     }
 
     if (scanner && !request.IsOnSameMultiplex())