Ticket #1985: deadlock-freebox.10277.diff

libs/libmythtv/freeboxrecorder.cpp

@@ -4 +4 @@
  *  Distributed as part of MythTV under GPL v2 and later.
  */
 
+#include "freeboxrecorder.h"
+
 #include <qwaitcondition.h>
 #include <qmutex.h>
 
@@ -15 +17 @@
 #include "mpeg/tspacket.h"
 #include "freeboxchannel.h"
 #include "freeboxmediasink.h"
-#include "freeboxrecorder.h"
 
 // ============================================================================
 // FreeboxData : Helper class use for static Callback handler
@@ -47 +48 @@
     MediaSession& session = subsession->parentSession();
     MediaSubsessionIterator iter(session);
 
-    while (subsession = iter.next())
+    while ((subsession = iter.next()))
     {
         if (subsession->sink)
             return;
@@ -76 +77 @@
                         FreeboxChannel  *channel) :
         _rec(recorder),
         _streamData(1, true),
+        _curChanInfo(channel->GetCurrentChanInfo()),
         _live_env(NULL),
         _rtsp_client(NULL),
         _session(NULL),
@@ -99 +101 @@
 
     // Gets
     FreeboxChannelInfo GetCurrentChanInfo(void) const
-        { return _channel->GetCurrentChanInfo(); }
+        { return _curChanInfo; }
     MPEGStreamData&    StreamData(void)
         { return _streamData; }
     UsageEnvironment*  GetLiveEnv(void)
@@ -113 +115 @@
     void SetLiveEnv(UsageEnvironment *env) { _live_env    = env;     }
     void SetRTSPClient(RTSPClient *client) { _rtsp_client = client;  }
     void SetSession(MediaSession *session) { _session     = session; }
+    void SetChannelInfo(const FreeboxChannelInfo& chanInfo)
+        { _curChanInfo = chanInfo; }
 
   public: // MPEGSingleProgramStreamListener
     void HandleSingleProgramPAT(ProgramAssociationTable *pat);
@@ -121 +125 @@
   private:
     FreeboxRecorder    *_rec;
     MPEGStreamData      _streamData;
+    FreeboxChannelInfo  _curChanInfo;
     UsageEnvironment   *_live_env;
     RTSPClient         *_rtsp_client;
     MediaSession       *_session;
@@ -157 +162 @@
     // Ensure RTSP cleanup, remove old RTSP session
     MediaSubsessionIterator iter(*_session);
     MediaSubsession *subsession;
-    while (subsession = iter.next())
+    while ((subsession = iter.next()))
     {
         Medium::close(subsession->sink);
         subsession->sink = NULL;
@@ -194 +199 @@
     _impl->Close();
 }
 
-void FreeboxRecorder::ChannelChanged(const FreeboxChannelInfo&)
+void FreeboxRecorder::ChannelChanged(const FreeboxChannelInfo& chanInfo)
 {
-    // Channel change, we need to close current RTSP flow, and open a new one
+    // keep a copy to avoid deadlocks
+    _impl->SetChannelInfo(chanInfo);
+    // Channel changed, we need to close current RTSP flow, and open a new one
     ResetEventLoop();
 }
 
@@ -308 +315 @@
     MediaSubsession *subsession;
     bool madeProgress = false;
 
-    while (subsession = iter.next())
+    while ((subsession = iter.next()))
     {
         if (!subsession->initiate(-1))
         {
@@ -363 +370 @@
     madeProgress = false;
     iter.reset();
 
-    while (subsession = iter.next())
+    while ((subsession = iter.next()))
     {
         if (!subsession->readSource())
             continue; // was not initiated