RingBuffer: Add an additional filename string for lock free debugging.

MythTV · Jun 4, 2011 · 933cd94 · 933cd94
1 parent 6405d87
commit 933cd94
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/bdringbuffer.cpp b/mythtv/libs/libmythtv/bdringbuffer.cpp
@@ -273,6 +273,7 @@ void BDRingBuffer::ProgressUpdate(void)
 
 bool BDRingBuffer::OpenFile(const QString &lfilename, uint retry_ms)
 {
+    safefilename = lfilename;
     filename = lfilename;
 
     VERBOSE(VB_IMPORTANT, LOC + QString("Opened BDRingBuffer device at %1")

diff --git a/mythtv/libs/libmythtv/dvdringbuffer.cpp b/mythtv/libs/libmythtv/dvdringbuffer.cpp
@@ -303,6 +303,7 @@ bool DVDRingBuffer::OpenFile(const QString &lfilename, uint retry_ms)
     if (m_dvdnav)
         CloseDVD();
 
+    safefilename = lfilename;
     filename = lfilename;
     QByteArray fname = filename.toLocal8Bit();
 

diff --git a/mythtv/libs/libmythtv/fileringbuffer.cpp b/mythtv/libs/libmythtv/fileringbuffer.cpp
@@ -45,6 +45,7 @@ FileRingBuffer::FileRingBuffer(const QString &lfilename,
                                bool write, bool readahead, int timeout_ms)
 {
     startreadahead = readahead;
+    safefilename = lfilename;
     filename = lfilename;
 
     if (write)

diff --git a/mythtv/libs/libmythtv/ringbuffer.cpp b/mythtv/libs/libmythtv/ringbuffer.cpp
@@ -171,7 +171,7 @@ RingBuffer::RingBuffer(void) :
     readpos(0),               writepos(0),
     internalreadpos(0),       ignorereadpos(-1),
     rbrpos(0),                rbwpos(0),
-    stopreads(false),
+    stopreads(false),         safefilename(QString()),
     filename(),               subtitlefilename(),
     tfw(NULL),                fd2(-1),
     writemode(false),         remotefile(NULL),

diff --git a/mythtv/libs/libmythtv/ringbuffer.h b/mythtv/libs/libmythtv/ringbuffer.h
@@ -49,6 +49,7 @@ class MTV_PUBLIC RingBuffer : protected QThread
     void EnableBitrateMonitor(bool enable) { bitrateMonitorEnabled = enable; }
 
     // Gets
+    QString   GetSafeFilename(void) { return safefilename; }
     QString   GetFilename(void)      const;
     QString   GetSubtitleFilename(void) const;
     /// Returns value of stopreads
@@ -69,6 +70,7 @@ class MTV_PUBLIC RingBuffer : protected QThread
     virtual bool IsOpen(void) const = 0;
     virtual bool IsStreamed(void)     { return LiveMode(); }
     virtual int  BestBufferSize(void) { return 32768; }
+    static QString BitrateToString(uint64_t rate);
 
     // DVD and bluray methods
     bool IsDisc(void) const { return IsDVD() || IsBD(); }
@@ -154,7 +156,6 @@ class MTV_PUBLIC RingBuffer : protected QThread
     void ResetReadAhead(long long newinternal);
     void KillReadAheadThread(void);
 
-    static QString BitrateToString(uint64_t rate);
     uint64_t UpdateDecoderRate(uint64_t latest = 0);
     uint64_t UpdateStorageRate(uint64_t latest = 0);
 
@@ -175,6 +176,7 @@ class MTV_PUBLIC RingBuffer : protected QThread
 
     mutable QReadWriteLock rwlock;
 
+    QString safefilename;         // unprotected (for debugging)
     QString filename;             // protected by rwlock
     QString subtitlefilename;     // protected by rwlock
 

diff --git a/mythtv/libs/libmythtv/streamingringbuffer.cpp b/mythtv/libs/libmythtv/streamingringbuffer.cpp
@@ -31,6 +31,7 @@ bool StreamingRingBuffer::OpenFile(const QString &lfilename, uint retry_ms)
 {
     av_register_all();
 
+    safefilename = lfilename;
     filename = lfilename;
     VERBOSE(VB_GENERAL, LOC + QString("Trying %1").arg(filename));