Ticket #11306: slave_shutdown_deadlock_for.v0.27.patch

mythtv/programs/mythbackend/encoderlink.cpp

@@ -41 +41 @@
                          QString lhostname)
     : m_capturecardnum(capturecardnum), sock(lsock), hostname(lhostname),
       tv(NULL), local(false), locked(false),
+      disconnected(false),
       sleepStatus(sStatus_Undefined), chanid(0)
 {
     endRecordingTime = MythDate::current().addDays(-2);
@@ -50 +51 @@
     lastSleepTime   = MythDate::current();
     lastWakeTime    = MythDate::current();
 
+    QMutexLocker locker(&sockLock);
     if (sock)
         sock->IncrRef();
 }
@@ -60 +62 @@
 EncoderLink::EncoderLink(int capturecardnum, TVRec *ltv)
     : m_capturecardnum(capturecardnum), sock(NULL),
       tv(ltv), local(true), locked(false),
+      disconnected(false),
       sleepStatus(sStatus_Undefined), chanid(0)
 {
     endRecordingTime = MythDate::current().addDays(-2);
@@ -91 +94 @@
  */
 void EncoderLink::SetSocket(PlaybackSock *lsock)
 {
+    QMutexLocker locker(&sockLock);
     if (lsock)
     {
         lsock->IncrRef();
@@ -100 +104 @@
         else
             SetSleepStatus(sStatus_Awake);
     }
-    else
-    {
-        if (IsFallingAsleep())
-            SetSleepStatus(sStatus_Asleep);
-        else
-            SetSleepStatus(sStatus_Undefined);
-    }
 
-    if (sock)
-        sock->DecrRef();
     sock = lsock;
+    disconnected = false;
+}
+
+void EncoderLink::Disconnect()
+{
+  QMutexLocker locker(&sockLock);
+
+  disconnected = true;
+
+  if (IsFallingAsleep())
+      SetSleepStatus(sStatus_Asleep);
+  else
+      SetSleepStatus(sStatus_Undefined);
+
+  if (sock)
+      sock->DecrRef();
 }
 
+
 /** \fn EncoderLink::SetSleepStatus(SleepStatus)
  *  \brief Sets the sleep status of a recorder
  */
@@ -129 +141 @@
  */
 bool EncoderLink::IsBusy(TunedInputInfo *busy_input, int time_buffer)
 {
+    if (disconnected)
+        return false;
+
     if (local)
         return tv->IsBusy(busy_input, time_buffer);
 
+    QMutexLocker locker(&sockLock);
     if (sock)
         return sock->IsBusy(m_capturecardnum, busy_input, time_buffer);
 
@@ -150 +166 @@
 {
     bool retval = false;
 
+    if (disconnected)
+        return retval;
+
     TVState state = GetState();
 
     if (state == kState_RecordingOnly || state == kState_WatchingRecording ||
@@ -175 +194 @@
     if (local)
         retval = tv->GetState();
     else if (sock)
-        retval = (TVState)sock->GetEncoderState(m_capturecardnum);
+    {
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            retval = (TVState)sock->GetEncoderState(m_capturecardnum);
+    }
     else
         LOG(VB_GENERAL, LOG_ERR, QString("Broken for card: %1")
             .arg(m_capturecardnum));
@@ -187 +210 @@
  *  \brief Returns the flag state of the recorder.
  *  \sa TVRec::GetFlags(void) const, \ref recorder_subsystem
  */
-uint EncoderLink::GetFlags(void) const
+uint EncoderLink::GetFlags(void)
 {
     uint retval = 0;
 
@@ -197 +220 @@
     if (local)
         retval = tv->GetFlags();
     else if (sock)
-        retval = sock->GetEncoderState(m_capturecardnum);
+    {
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            retval = sock->GetEncoderState(m_capturecardnum);
+    }
     else
         LOG(VB_GENERAL, LOG_ERR, LOC + "GetFlags failed");
 
@@ -211 +238 @@
  */
 bool EncoderLink::IsRecording(const ProgramInfo *rec)
 {
+    if (!IsConnected())
+        return false;
+
     return (rec->GetChanID() == chanid &&
             rec->GetRecordingStartTime() == startRecordingTime);
 }
@@ -228 +258 @@
     bool retval = false;
     ProgramInfo *tvrec = NULL;
 
+    if (!IsConnected())
+        return retval;
+
     if (local)
     {
         while (kState_ChangingState == GetState())
@@ -244 +277 @@
     }
     else
     {
+        QMutexLocker locker(&sockLock);
         if (sock)
             retval = sock->EncoderIsRecording(m_capturecardnum, rec);
     }
@@ -262 +296 @@
 void EncoderLink::RecordPending(const ProgramInfo *rec, int secsleft,
                                 bool hasLater)
 {
+    if (!IsConnected())
+        return;
+
     if (local)
         tv->RecordPending(rec, secsleft, hasLater);
-    else if (sock)
-        sock->RecordPending(m_capturecardnum, rec, secsleft, hasLater);
+    else
+    {
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            sock->RecordPending(m_capturecardnum, rec, secsleft, hasLater);
+    }
 }
 
 /** \fn EncoderLink::WouldConflict(const ProgramInfo*)
@@ -278 +319 @@
     if (!IsConnected())
         return true;
 
+    QMutexLocker locker(&sockLock);
     if (rec->GetRecordingStartTime() < endRecordingTime)
         return true;
 
@@ -287 +329 @@
 /// Checks if program is stored locally
 bool EncoderLink::CheckFile(ProgramInfo *pginfo)
 {
+    if (!IsConnected())
+        return false;
+
+    QMutexLocker locker(&sockLock);
     if (sock)
         return sock->CheckFile(pginfo);
 
@@ -301 +347 @@
  */
 void EncoderLink::GetDiskSpace(QStringList &o_strlist)
 {
+    if (!IsConnected())
+        return;
+
+    QMutexLocker locker(&sockLock);
     if (sock)
         sock->GetDiskSpace(o_strlist);
 }
@@ -313 +363 @@
  */
 long long EncoderLink::GetMaxBitrate()
 {
+    if (!IsConnected())
+        return -1;
+    
     if (local)
         return tv->GetMaxBitrate();
-    else if (sock)
-        return sock->GetMaxBitrate(m_capturecardnum);
-
+    else
+    {
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            return sock->GetMaxBitrate(m_capturecardnum);
+    }
     return -1;
 }
 
@@ -339 +395 @@
 {
     if (local)
         return tv->SetSignalMonitoringRate(rate, notifyFrontend);
-    else if (sock)
-        return sock->SetSignalMonitoringRate(m_capturecardnum, rate,
-                                             notifyFrontend);
+    else
+    {
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            return sock->SetSignalMonitoringRate(m_capturecardnum, rate,
+                                                 notifyFrontend);
+    }
     return -1;
 }
 
@@ -349 +409 @@
  */
 bool EncoderLink::GoToSleep(void)
 {
-    if (IsLocal() || !sock)
+    if (!IsConnected())
+        return false;
+ 
+    if (IsLocal())
+        return false;
+
+    QMutexLocker locker(&sockLock);
+    if (!sock)
         return false;
 
     lastSleepTime = MythDate::current();
@@ -363 +430 @@
  */
 int EncoderLink::LockTuner()
 {
+    if (!IsConnected())
+        return -2;
+
     if (locked)
         return -2;
 
@@ -381 +451 @@
 {
     RecStatusType retval = rsAborted;
 
+    if (!IsConnected())
+        return retval;
+
     endRecordingTime = rec->GetRecordingEndTime();
     startRecordingTime = rec->GetRecordingStartTime();
     chanid = rec->GetChanID();
 
     if (local)
         retval = tv->StartRecording(rec);
-    else if (sock)
-        retval = sock->StartRecording(m_capturecardnum, rec);
     else
-        LOG(VB_GENERAL, LOG_ERR,
-            QString("Wanted to start recording on recorder %1,\n\t\t\t"
-                    "but the backend is not there anymore\n")
-                .arg(m_capturecardnum));
+    {
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            retval = sock->StartRecording(m_capturecardnum, rec);
+        else
+            LOG(VB_GENERAL, LOG_ERR,
+                QString("Wanted to start recording on recorder %1,\n\t\t\t"
+                        "but the backend is not there anymore\n")
+                    .arg(m_capturecardnum));
+    }
 
     if (retval != rsRecording && retval != rsTuning)
     {
@@ -409 +486 @@
 {
     RecStatusType retval = rsAborted;
 
+    if (!IsConnected())
+        return retval;
+
     if (local)
         retval = tv->GetRecordingStatus();
-    else if (sock)
-        retval = sock->GetRecordingStatus(m_capturecardnum);
     else
-        LOG(VB_GENERAL, LOG_ERR,
-            QString("Wanted to get status on recorder %1,\n\t\t\t"
-                    "but the backend is not there anymore\n")
-                .arg(m_capturecardnum));
+    {
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            retval = sock->GetRecordingStatus(m_capturecardnum);
+        else
+            LOG(VB_GENERAL, LOG_ERR,
+                QString("Wanted to get status on recorder %1,\n\t\t\t"
+                        "but the backend is not there anymore\n")
+                    .arg(m_capturecardnum));
+    }
 
     if (retval != rsRecording && retval != rsTuning)
     {
@@ -439 +523 @@
 {
     ProgramInfo *info = NULL;
 
+    if (!IsConnected())
+        return info;
+
     if (local)
         info = tv->GetRecording();
-    else if (sock)
-        info = sock->GetRecording(m_capturecardnum);
+    else
+    {
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            info = sock->GetRecording(m_capturecardnum);
 
+    }
     return info;
 }
 
@@ -454 +545 @@
  */
 void EncoderLink::StopRecording(bool killFile)
 {
+    if (!IsConnected())
+        return;
+
     endRecordingTime = MythDate::current().addDays(-2);
     startRecordingTime = endRecordingTime;
     chanid = 0;
@@ -490 +584 @@
  */
 bool EncoderLink::IsReallyRecording(void)
 {
+    if (!IsConnected())
+        return false;
+
     if (local)
         return tv->IsReallyRecording();
 
@@ -506 +603 @@
  */
 float EncoderLink::GetFramerate(void)
 {
+    if (!IsConnected())
+        return -1;
+
     if (local)
         return tv->GetFramerate();
 
@@ -611 +711 @@
     if (local)
         tv->CancelNextRecording(cancel);
     else
-        sock->CancelNextRecording(m_capturecardnum, cancel);
+    {
+        if (!IsConnected())
+            return;
+
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            sock->CancelNextRecording(m_capturecardnum, cancel);
+    }
 }
 
 /** \fn EncoderLink::SpawnLiveTV(LiveTVChain*, bool, QString)
@@ -694 +801 @@
     if (local)
         tv->SetNextLiveTVDir(dir);
     else
-        sock->SetNextLiveTVDir(m_capturecardnum, dir);
+    {
+        if (!IsConnected())
+            return;
+
+        QMutexLocker locker(&sockLock);
+        if (sock)
+            sock->SetNextLiveTVDir(m_capturecardnum, dir);
+    }
 }
 
 /** \fn EncoderLink::GetFreeInputs(const vector<uint>&) const
@@ -703 +817 @@
  *  \sa TVRec::GetFreeInputs(const vector<uint>&) const
  */
 vector<InputInfo> EncoderLink::GetFreeInputs(
-    const vector<uint> &excluded_cardids) const
+    const vector<uint> &excluded_cardids)
 {
     vector<InputInfo> list;
 
     if (local)
         list = tv->GetFreeInputs(excluded_cardids);
     else
+    {
+        if (!IsConnected())
+            return list;
+
+        QMutexLocker locker(&sockLock);
         list = sock->GetFreeInputs(m_capturecardnum, excluded_cardids);
 
+    }
     return list;
 }
 

mythtv/programs/mythbackend/encoderlink.h

@@ -3 +3 @@
 
 #include <QString>
 #include <QMap>
+#include <QMutex>
+
 
 #include "tv.h"
 #include "programinfo.h"
@@ -23 +25 @@
 
     /// \brief Used to set the socket for a non-local EncoderLink.
     void SetSocket(PlaybackSock *lsock);
+
+    /// \brief Used to unset the socket for a non-local EncoderLink.
+    void Disconnect();
     /// \brief Returns the socket, if set, for a non-local EncoderLink.
     PlaybackSock *GetSocket(void) { return sock; }
 
@@ -42 +47 @@
     /// \brief Returns true for a local EncoderLink.
     bool IsLocal(void) const { return local; }
     /// \brief Returns true if the EncoderLink instance is usable.
-    bool IsConnected(void) const { return (IsLocal() || sock!=NULL); }
+    bool IsConnected(void) { bool value;
+                             if (disconnected)
+                                 return false;
+                             value = IsLocal();
+                             if (value)
+                                 return value;
+                             if (sock)
+                                 return true;
+                             return false;
+                           }
     /// \brief Returns true if the encoder is awake.
     bool IsAwake(void) const { return (sleepStatus == sStatus_Awake); }
     /// \brief Returns true if the encoder is asleep.
@@ -82 +96 @@
     bool IsBusyRecording(void);
 
     TVState GetState();
-    uint GetFlags(void) const;
+    uint GetFlags(void);
     bool IsRecording(const ProgramInfo *rec); // scheduler call only.
 
     bool MatchesRecording(const ProgramInfo *rec);
@@ -109 +123 @@
     void PauseRecorder(void);
     void SetLiveRecording(int);
     void SetNextLiveTVDir(QString dir);
-    vector<InputInfo> GetFreeInputs(const vector<uint> &excluded_cards) const;
+    vector<InputInfo> GetFreeInputs(const vector<uint> &excluded_cards);
     QString GetInput(void) const;
     QString SetInput(QString);
     void ToggleChannelFavorite(QString);
@@ -139 +153 @@
   private:
     int m_capturecardnum;
 
+    QMutex sockLock;
+
     PlaybackSock *sock;
     QString hostname;
 
@@ -146 +162 @@
 
     bool local;
     bool locked;
+    bool disconnected;
 
     SleepStatus sleepStatus;
     QDateTime sleepStatusTime;

mythtv/programs/mythbackend/mainserver.cpp

@@ -5824 +5824 @@
                         if (!elink->IsFallingAsleep())
                             isFallingAsleep = false;
 
-                        elink->SetSocket(NULL);
+                        elink->Disconnect();
                         if (m_sched)
                             disconnectedSlaves.push_back(elink->GetCardID());
                     }

mythtv/programs/mythbackend/playbacksock.cpp

@@ -17 +17 @@
 PlaybackSock::PlaybackSock(
     MainServer *parent, MythSocket *lsock,
     QString lhostname, PlaybackSockEventsMode eventsMode) :
-    ReferenceCounter("PlaybackSock")
+    ReferenceCounter("PlaybackSock"),
+    sockLock(QMutex::Recursive)
 {
     m_parent = parent;
     QString localhostname = gCoreContext->GetHostName();
@@ -77 +78 @@
 {
     bool ok = false;
 
+    QMutexLocker locker(&sockLock);
+    if (!sock)
+        return false;
+
     sock->IncrRef();
 
     {
-        QMutexLocker locker(&sockLock);
         expectingreply = true;
 
         ok = sock->SendReceiveStringList(strlist);
@@ -318 +322 @@
 {
     QStringList strlist(QString("QUERY_REMOTEENCODER %1").arg(capturecardnum));
 
+    QMutexLocker locker(&sockLock);
+    if (disconnected)
+        return true;
+
     strlist << "IS_BUSY";
     strlist << QString::number(time_buffer);
 

mythtv/programs/mythbackend/playbacksock.h

@@ -31 +31 @@
                  QString lhostname, PlaybackSockEventsMode eventsMode);
     virtual ~PlaybackSock();
 
-    void SetDisconnected(void) { disconnected = true; }
+    void SetDisconnected(void) { QMutexLocker locker(&sockLock); disconnected = true; }
     bool IsDisconnected(void) const { return disconnected; }
 
     MythSocket *getSocket(void) const { return sock; }