Ticket #1153: ringBufferSwitchRaceConditionFix.diff

libs/libmythtv/recorderbase.cpp

@@ -197 +197 @@
 
     if (nextRingBuffer)
     {
+        VERBOSE(VB_RECORD, LOC + "CheckForRingBufferSwitch() - Switching Ring-Buffer");
+
         FinishRecording();
         ResetForNewFile();
 

libs/libmythtv/tv_rec.cpp

@@ -136 +136 @@
       // tvchain
       tvchain(NULL),
       // RingBuffer info
-      ringBuffer(NULL), rbFilePrefix(""), rbFileExt("mpg")
+      ringBuffer(NULL),
+      ringBufferSwitchInProgress(false),
+      rbFilePrefix(""), rbFileExt("mpg")
 {
 }
 
@@ -1333 +1335 @@
                         <<"!has_rec("<<!has_rec<<") "
                         <<"!rec_soon("<<!rec_soon<<") "
                         <<"curRec("<<curRecording<<") "
-                        <<"starttm("<<starttime.toString(Qt::ISODate)<<")");
+                        <<"starttm("<<starttime.toString(Qt::ISODate)<<")"
+                        <<"now(" << now.toString(Qt::ISODate)<<")"
+                        <<"curRecording->endts(" << curRecording->endts.toString(Qt::ISODate)<<")");
 //                last = QDateTime::currentDateTime().addSecs(20); 
             }
             else
@@ -3088 +3092 @@
         curRecording = new ProgramInfo(*pginfo);
         curRecording->MarkAsInUse(true, "recorder");
     }
+    ringBufferSwitchInProgress = false;
 }
 
 QString TVRec::TuningGetChanNum(const TuningRequest &request,
@@ -4089 +4094 @@
 bool TVRec::SwitchLiveTVRingBuffer(bool discont, bool set_rec)
 {
     VERBOSE(VB_RECORD, LOC + "SwitchLiveTVRingBuffer(discont "
-            <<discont<<", set_rec "<<set_rec<<")");
+            <<discont<<", set_rec "<<set_rec<<") - ringBufferSwitchInProgress(" << ringBufferSwitchInProgress << ")");
 
+    if (set_rec && ringBufferSwitchInProgress)
+    {
+        /* The ring-buffer is already being switched */
+        return false;
+    }
+    else if (set_rec && !ringBufferSwitchInProgress)
+    {
+        ringBufferSwitchInProgress = true;
+    }
+
     ProgramInfo *pginfo = NULL;
     RingBuffer *rb = NULL;
 

libs/libmythtv/tv_rec.h

@@ -366 +366 @@
 
     // RingBuffer info
     RingBuffer  *ringBuffer;
+    bool         ringBufferSwitchInProgress;
     QString      rbFilePrefix;
     QString      rbFileExt;