Improved EIT log messages

More consistent use of chanid and channum in log messages.
Better identification of passive and active scan in log messages.

mythtv/libs/libmythtv/eitcache.cpp

@@ -243,7 +243,7 @@ event_map_t * EITCache::LoadChannel(uint chanid)
     }
 
     if (!eventMap->empty())
-        LOG(VB_EIT, LOG_INFO, LOC + QString("Loaded %1 entries for channel %2")
+        LOG(VB_EIT, LOG_INFO, LOC + QString("Loaded %1 entries for chanid %2")
                 .arg(eventMap->size()).arg(chanid));
 
     m_entryCnt += eventMap->size();
@@ -286,13 +286,13 @@ bool EITCache::WriteChannelToDB(QStringList &value_clauses, uint chanid)
     if (updated)
     {
         LOG(VB_EIT, LOG_INFO, LOC + QString("Writing %1 modified entries of %2 "
-                                      "for channel %3 to database.")
+                                      "for chanid %3 to database.")
                 .arg(updated).arg(size).arg(chanid));
     }
     if (removed)
     {
         LOG(VB_EIT, LOG_INFO, LOC + QString("Removed %1 old entries of %2 "
-                                      "for channel %3 from cache.")
+                                      "for chanid %3 from cache.")
                 .arg(removed).arg(size).arg(chanid));
     }
     m_pruneCnt += removed;

mythtv/libs/libmythtv/eitscanner.cpp

@@ -127,7 +127,7 @@ void EITScanner::run(void)
                     m_eitHelper->SetChannelID(ChannelUtil::GetChanID(
                         m_rec->GetSourceID(), *m_activeScanNextChan));
                     LOG(VB_EIT, LOG_INFO, LOC_ID +
-                        QString("Now looking for EIT data on multiplex of channel %1 of source %2")
+                        QString("Next looking for EIT data on multiplex of channel %1 of source %2")
                         .arg(*m_activeScanNextChan).arg(m_rec->GetSourceID()));
                 }
             }
@@ -174,12 +174,12 @@ void EITScanner::RescheduleRecordings(void)
     m_eitHelper->RescheduleRecordings();
 }
 
-/** \fn EITScanner::StartPassiveScan(ChannelBase*, EITSource*, bool)
+/** \fn EITScanner::StartEITEventProcessing(ChannelBase*, EITSource*, bool)
  *  \brief Start inserting Event Information Tables from the multiplex
  *         we happen to be tuned to into the database.
  */
-void EITScanner::StartPassiveScan(ChannelBase *channel,
-                                  EITSource *eitSource)
+void EITScanner::StartEITEventProcessing(ChannelBase *channel,
+                                         EITSource *eitSource)
 {
     QMutexLocker locker(&m_lock);
 
@@ -194,7 +194,7 @@ void EITScanner::StartPassiveScan(ChannelBase *channel,
         m_eitHelper->SetChannelID(chanid);
         m_eitHelper->SetSourceID(ChannelUtil::GetSourceIDForChannel(chanid));
         LOG(VB_EIT, LOG_INFO, LOC_ID +
-            QString("Started processing EIT events in %1 scan for channel %2 chanid %3")
+            QString("Start processing EIT events in %1 scan for channel %2 chanid %3")
                 .arg(m_activeScan ? "active" : "passive",
                      m_channel->GetChannelName(),
                      QString::number(chanid)));
@@ -207,10 +207,10 @@ void EITScanner::StartPassiveScan(ChannelBase *channel,
     }
 }
 
-/** \fn EITScanner::StopPassiveScan(void)
+/** \fn EITScanner::StopEITEventProcessing(void)
  *  \brief Stops inserting Event Information Tables into DB.
  */
-void EITScanner::StopPassiveScan(void)
+void EITScanner::StopEITEventProcessing(void)
 {
     QMutexLocker locker(&m_lock);
 
@@ -225,7 +225,7 @@ void EITScanner::StopPassiveScan(void)
     m_eitHelper->SetChannelID(0);
     m_eitHelper->SetSourceID(0);
     LOG(VB_EIT, LOG_INFO, LOC_ID +
-        QString("Stopped processing EIT events in %1 scan")
+        QString("Stop processing EIT events in %1 scan")
             .arg(m_activeScanStopped ? "passive" : "active"));
 }
 
@@ -308,11 +308,9 @@ void EITScanner::StopActiveScan(void)
     m_exitThreadCond.wakeAll();
 
     locker.unlock();
-    StopPassiveScan();
+    StopEITEventProcessing();
     locker.relock();
 
-    LOG(VB_EIT, LOG_INFO, LOC_ID + "Stopped active scan");
-
     while (!m_activeScan && !m_activeScanStopped)
         m_activeScanCond.wait(&m_lock, 100);
 

mythtv/libs/libmythtv/eitscanner.h

@@ -28,16 +28,14 @@ class EITSource
     virtual void SetEITRate(float rate) = 0;
 };
 
-class EITScanner;
-
 class EITScanner : public QRunnable
 {
   public:
     explicit EITScanner(uint cardnum);
     ~EITScanner() override { TeardownAll(); }
 
-    void StartPassiveScan(ChannelBase *channel, EITSource *eitSource);
-    void StopPassiveScan(void);
+    void StartEITEventProcessing(ChannelBase *channel, EITSource *eitSource);
+    void StopEITEventProcessing(void);
 
     void StartActiveScan(TVRec *rec, std::chrono::seconds max_seconds_per_source);
     void StopActiveScan(void);
@@ -60,7 +58,7 @@ class EITScanner : public QRunnable
     QWaitCondition        m_exitThreadCond;                     // protected by lock
 
     TVRec                *m_rec                     {nullptr};
-    volatile bool         m_activeScan              {false};
+    volatile bool         m_activeScan              {false};    // active scan true, passive scan false
     volatile bool         m_activeScanStopped       {true};     // protected by lock
     QWaitCondition        m_activeScanCond;                     // protected by lock
     QDateTime             m_activeScanNextTrig;

mythtv/libs/libmythtv/tv_rec.cpp

@@ -1034,6 +1034,8 @@ void TVRec::HandleStateChange(void)
     // to avoid race condition with it's tuning requests.
     if (m_scanner && HasFlags(kFlagEITScannerRunning))
     {
+        LOG(VB_EIT, LOG_INFO, LOC + QString("Stop EIT scan on input %1").arg(GetInputId()));
+
         m_scanner->StopActiveScan();
         ClearFlags(kFlagEITScannerRunning, __FILE__, __LINE__);
         auto secs = m_eitCrawlIdleStart + eit_start_rand(m_inputId, m_eitTransportTimeout);
@@ -3519,7 +3521,7 @@ void TVRec::TuningShutdowns(const TuningRequest &request)
     }
 
     if (m_scanner && !request.IsOnSameMultiplex())
-        m_scanner->StopPassiveScan();
+        m_scanner->StopEITEventProcessing();
 
     if (HasFlags(kFlagSignalMonitorRunning))
     {
@@ -3991,7 +3993,7 @@ MPEGStreamData *TVRec::TuningSignalCheck(void)
                 "EIT scanning disabled for all sources on this input.");
         }
         else if (m_scanner)
-            m_scanner->StartPassiveScan(m_channel, streamData);
+            m_scanner->StartEITEventProcessing(m_channel, streamData);
     }
 
     return streamData;