comparison data/fft/FFTFileCache.cpp @ 458:f60360209e5c

* Fix race condition in FFTFileCache when reading from the same FFT model
  from multiple threads (e.g. when applying more than one plugin at once)

 FFTFileCache::resize(size_t width, size_t height)
 {
     MutexLocker locker(&m_writeMutex, "FFTFileCache::resize::m_writeMutex");
 
     m_mfc->resize(width, height * 2 + m_factorSize);
-    if (m_readbuf) {
-        delete[] m_readbuf;
-        m_readbuf = 0;
-    }
+
+    {
+        MutexLocker locker(&m_readbufMutex, "FFTFileCache::resize::m_readMutex");
+        if (m_readbuf) {
+            delete[] m_readbuf;
+            m_readbuf = 0;
+        }
+    }
+
     if (m_writebuf) {
         delete[] m_writebuf;
     }
     m_writebuf = new char[(height * 2 + m_factorSize) * m_mfc->getCellSize()];
 }
-
+    
 void
 FFTFileCache::reset()
 {
     m_mfc->reset();
 }

         (type == Compact ? sizeof(uint16_t) : sizeof(float)) +
         2 * sizeof(size_t); // matrix file header size
 }
 
 void
-FFTFileCache::populateReadBuf(size_t x) const
+FFTFileCache::populateReadBuf(size_t x) const // m_readbufMutex already held
 {
     Profiler profiler("FFTFileCache::populateReadBuf", false);
 
     if (!m_readbuf) {
         m_readbuf = new char[m_mfc->getHeight() * 2 * m_mfc->getCellSize()];