Ticket #13230: 13207-debug4.patch

mythtv/libs/libmythtv/eitscanner.cpp

@@ -283 +283 @@
 
 void EITScanner::StopActiveScan(void)
 {
+    LOG(VB_EIT, LOG_INFO,
+        LOC_ID + QString("##StopActiveScan() entering"));
     QMutexLocker locker(&lock);
+    LOG(VB_EIT, LOG_INFO,
+        LOC_ID + QString("##StopActiveScan() locked"));
 
     activeScanStopped = false;
     activeScan = false;
     exitThreadCond.wakeAll();
+    LOG(VB_EIT, LOG_INFO,
+        LOC_ID + QString("##StopActiveScan() woke all"));
 
     locker.unlock();
+    LOG(VB_EIT, LOG_INFO,
+        LOC_ID + QString("##StopActiveScan() unlocked"));
     StopPassiveScan();
     locker.relock();
+    LOG(VB_EIT, LOG_INFO,
+        LOC_ID + QString("##StopActiveScan() relocked"));
 
     while (!activeScan && !activeScanStopped)
         activeScanCond.wait(&lock, 100);
 
+    LOG(VB_EIT, LOG_INFO,
+        LOC_ID + QString("##StopActiveScan() finished"));
     rec = NULL;
 }

mythtv/libs/libmythtv/recorders/dvbchannel.cpp

@@ -145 +145 @@
 
 void DVBChannel::Close(DVBChannel *who)
 {
-    LOG(VB_CHANNEL, LOG_INFO, LOC + "Closing DVB channel");
+    LOG(VB_CHANNEL, LOG_INFO, LOC + "##Closing DVB channel");
 
     IsOpenMap::iterator it = is_open.find(who);
     if (it == is_open.end())
+    {
+        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##Not open");
         return; // this caller didn't have it open in the first place..
+    }
 
     is_open.erase(it);
 
@@ -163 +166 @@
         master->Close(this);
         fd_frontend = -1;
         ReturnMasterLock(master);
+        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##master->Close9) succeeded");
         return;
     }
     ReturnMasterLock(master); // if we're the master we don't need this lock..
 
     if (!is_open.empty())
+    {
+        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##still has other callers");
         return; // not all callers have closed the DVB channel yet..
+    }
 
     if (diseqc_tree)
         diseqc_tree->Close();
@@ -180 +187 @@
 
         dvbcam->Stop();
     }
+    LOG(VB_CHANNEL, LOG_INFO, LOC + "##Succeeded");
 }
 
 bool DVBChannel::Open(DVBChannel *who)
 {
-    LOG(VB_CHANNEL, LOG_INFO, LOC + "Opening DVB channel");
+    LOG(VB_CHANNEL, LOG_INFO, LOC + "##Opening DVB channel");
 
     if (!m_inputid)
     {
         if (!InitializeInput())
+        {
+            LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##InitializeInput() failed");
             return false;
+        }
     }
 
     QMutexLocker locker(&hw_lock);
 
     if (fd_frontend >= 0)
     {
+        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##fd_frontend already set");
         is_open[who] = true;
         return true;
     }
@@ -205 +217 @@
     {
         if (!master->Open(who))
         {
+            LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##master->Open() failed");
             ReturnMasterLock(master);
             return false;
         }
@@ -223 +236 @@
 
         if (!InitializeInput())
         {
+            LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##InitializeInput2() failed");
             Close();
             ReturnMasterLock(master);
             return false;
         }
 
+        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##InitializeInput2() succedded");
         ReturnMasterLock(master);
         return true;
     }
@@ -242 +257 @@
         if (fd_frontend >= 0)
             break;
         LOG(VB_GENERAL, LOG_WARNING, LOC +
-            "Opening DVB frontend device failed." + ENO);
+            "  ##Opening DVB frontend device failed." + ENO);
         if (tries >= 20 || (errno != EBUSY && errno != EAGAIN))
         {
             LOG(VB_GENERAL, LOG_ERR, LOC +
-                QString("Failed to open DVB frontend device due to "
+                QString("  ##Failed to open DVB frontend device due to "
                         "fatal error or too many attempts."));
             return false;
         }
@@ -258 +273 @@
     if (ioctl(fd_frontend, FE_GET_INFO, &info) < 0)
     {
         LOG(VB_GENERAL, LOG_ERR, LOC +
-            "Failed to get frontend information." + ENO);
+            "  ##Failed to get frontend information." + ENO);
 
         close(fd_frontend);
         fd_frontend = -1;
@@ -312 +327 @@
 
     if (!InitializeInput())
     {
+        LOG(VB_CHANNEL, LOG_INFO, LOC + "  ##InitializeInput3() failed");
         Close();
         return false;
     }
@@ -319 +335 @@
     if (fd_frontend >= 0)
         is_open[who] = true;
 
+    LOG(VB_CHANNEL, LOG_INFO, LOC + "##Succedded");
     return (fd_frontend >= 0);
 }
 

mythtv/libs/libmythtv/tv_rec.cpp

@@ -1460 +1460 @@
                     CardUtil::GetConflictingInputs(inputid);
                 InputInfo busy_input;
                 for (uint i = 0; i < inputids.size() && allow_eit; ++i)
-                    allow_eit = !RemoteIsBusy(inputids[i], busy_input);
+                    allow_eit = !RemoteIsBusy(inputids[i], busy_input, 630);
                 if (allow_eit)
                 {
                     scanner->StartActiveScan(this, eitTransportTimeout);
@@ -1471 +1471 @@
                 else
                 {
                     LOG(VB_CHANNEL, LOG_INFO, LOC + QString(
-                            "Postponing EIT scan on input %1 "
+                            "##Postponing EIT scan on input %1 "
                             "because input %2 is busy")
                         .arg(inputid).arg(busy_input.inputid));
                     eitScanStartTime = eitScanStartTime.addSecs(300);
@@ -1570 +1570 @@
     if (pendingRecordings.empty())
         return;
 
+    // Make sure EIT scan is stopped so it does't interfere
+    if (scanner && HasFlags(kFlagEITScannerRunning))
+    {
+        LOG(VB_CHANNEL, LOG_INFO, LOC + "##Stopping active EIT scan for pending recording.");
+
+        scanner->StopActiveScan();
+        ClearFlags(kFlagEITScannerRunning, __FILE__, __LINE__);
+        LOG(VB_CHANNEL, LOG_INFO, LOC + "##Stopped active EIT scan for pending recording.");
+
+        CloseChannel();
+
+        eitScanStartTime = MythDate::current();
+        eitScanStartTime = eitScanStartTime.addSecs(
+            eitCrawlIdleStart + 30 + eit_start_rand(inputid, eitTransportTimeout));
+    }
+
     // If we have a pending recording and AskAllowRecording
     // or DoNotAskAllowRecording is set and the frontend is
     // ready send an ASK_RECORDING query to frontend.

mythtv/libs/libmythtv/tvremoteutil.cpp

@@ -356 +356 @@
     return new RemoteEncoder(recordernum, hostname, port);
 }
 
-bool RemoteIsBusy(uint inputid, InputInfo &busy_input)
+bool RemoteIsBusy(uint inputid, InputInfo &busy_input, int time_buffer)
 {
 #if 0
     LOG(VB_GENERAL, LOG_DEBUG, QString("RemoteIsBusy(%1) %2")
@@ -369 +369 @@
     {
         const TVRec *rec = TVRec::GetTVRec(inputid);
         if (rec)
-            return rec->IsBusy(&busy_input);
+            return rec->IsBusy(&busy_input, time_buffer);
     }
 
     QStringList strlist(QString("QUERY_REMOTEENCODER %1").arg(inputid));
     strlist << "IS_BUSY";
+    strlist << QString::number(time_buffer);
     if (!gCoreContext->SendReceiveStringList(strlist) || strlist.empty())
         return true;
 

mythtv/libs/libmythtv/tvremoteutil.h

@@ -47 +47 @@
 RemoteRequestFreeRecorderList(uint excluded_input);
 MTV_PUBLIC vector<uint>
 RemoteRequestFreeInputList(uint excluded_input);
-MTV_PUBLIC bool RemoteIsBusy(uint inputid, InputInfo &busy_input);
+MTV_PUBLIC bool RemoteIsBusy(uint inputid, InputInfo &busy_input,
+                             int time_buffer = 5);
 
 MTV_PUBLIC bool RemoteGetRecordingStatus(
     vector<TunerStatus> *tunerList = NULL, bool list_inactive = false);