comparison data/fft/FFTDataServer.cpp @ 1081:027d8b943be5

Do not attempt to switch from read-only to read-write mode if an error is pending (may cause mutex deadlock)

         int col;
         FFTCacheReader *cache = getCacheReader(x, col);
         if (!cache) return 0;
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") return false;
             Profiler profiler("FFTDataServer::getMagnitudeAt: filling");
 #ifdef DEBUG_FFT_SERVER
             std::cerr << "FFTDataServer::getMagnitudeAt: calling fillColumn("
                   << x << ")" << std::endl;
 #endif

         int col;
         FFTCacheReader *cache = getCacheReader(x, col);
         if (!cache) return false;
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") return false;
             Profiler profiler("FFTDataServer::getMagnitudesAt: filling");
             fillColumn(x);
         }
 
         cache->getMagnitudesAt(col, values, minbin, count, step);

         int col;
         FFTCacheReader *cache = getCacheReader(x, col);
         if (!cache) return 0;
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") return false;
             Profiler profiler("FFTDataServer::getNormalizedMagnitudeAt: filling");
             fillColumn(x);
         }
         val = cache->getNormalizedMagnitudeAt(col, y);
 

         int col;
         FFTCacheReader *cache = getCacheReader(x, col);
         if (!cache) return false;
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") return false;
             Profiler profiler("FFTDataServer::getNormalizedMagnitudesAt: filling");
             fillColumn(x);
         }
         
         for (int i = 0; i < count; ++i) {

         int col;
         FFTCacheReader *cache = getCacheReader(x, col);
         if (!cache) return 0;
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") return false;
             Profiler profiler("FFTDataServer::getMaximumMagnitudeAt: filling");
             fillColumn(x);
         }
         val = cache->getMaximumMagnitudeAt(col);
 

         int col;
         FFTCacheReader *cache = getCacheReader(x, col);
         if (!cache) return 0;
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") return false;
             Profiler profiler("FFTDataServer::getPhaseAt: filling");
             fillColumn(x);
         }
         val = cache->getPhaseAt(col, y);
 

         int col;
         FFTCacheReader *cache = getCacheReader(x, col);
         if (!cache) return false;
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") return false;
             Profiler profiler("FFTDataServer::getPhasesAt: filling");
             fillColumn(x);
         }
         
         for (int i = 0; i < count; ++i) {

             imaginary = 0;
             return;
         }
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") {
+                real = 0;
+                imaginary = 0;
+                return;
+            }
             Profiler profiler("FFTDataServer::getValuesAt: filling");
 #ifdef DEBUG_FFT_SERVER
             std::cerr << "FFTDataServer::getValuesAt(" << x << ", " << y << "): filling" << std::endl;
 #endif
             fillColumn(x);

         int col;
         FFTCacheReader *cache = getCacheReader(x, col);
         if (!cache) return false;
 
         if (!cache->haveSetColumnAt(col)) {
+            if (getError() != "") return false;
             Profiler profiler("FFTDataServer::getValuesAt: filling");
             fillColumn(x);
         }
 
         for (int i = 0; i < count; ++i) {

 }
 
 QString
 FFTDataServer::getError() const
 {
-    if (m_error != "") return m_error;
-    else if (m_fillThread) return m_fillThread->getError();
-    else return "";
+    QString err;
+    if (m_error != "") {
+        err = m_error;
+        cerr << "FFTDataServer::getError: err (server " << this << ") = " << err << endl;
+    } else {
+        MutexLocker locker(&m_fftBuffersLock, "FFTDataServer::getError");
+        if (m_fillThread) {
+            err = m_fillThread->getError();
+            cerr << "FFTDataServer::getError: err (server " << this << ", from thread " << m_fillThread
+                 << ") = " << err << endl;
+        }
+    }
+    return err;
 }
 
 int
 FFTDataServer::getFillCompletion() const 
 {

         for (sv_frame_t f = m_fillFrom; f < end; f += m_server.m_windowIncrement) {
 	    
             try {
                 m_server.fillColumn(int((f - start) / m_server.m_windowIncrement));
             } catch (std::exception &e) {
-                std::cerr << "FFTDataServer::FillThread::run: exception: " << e.what() << std::endl;
-                m_error = e.what();
+                MutexLocker locker(&m_server.m_fftBuffersLock,
+                                   "FFTDataServer::run::m_fftBuffersLock [err]");
+                m_threadError = e.what();
+                std::cerr << "FFTDataServer::FillThread::run: exception: " << m_threadError << " (thread = " << this << " from server " << &m_server << ")" << std::endl;
                 m_server.fillComplete();
                 m_completion = 100;
                 m_extent = end;
                 return;
             }

     for (sv_frame_t f = start; f < remainingEnd; f += m_server.m_windowIncrement) {
 
         try {
             m_server.fillColumn(int((f - start) / m_server.m_windowIncrement));
         } catch (std::exception &e) {
-            std::cerr << "FFTDataServer::FillThread::run: exception: " << e.what() << std::endl;
-            m_error = e.what();
+            MutexLocker locker(&m_server.m_fftBuffersLock,
+                               "FFTDataServer::run::m_fftBuffersLock [err]");
+            m_threadError = e.what();
+                std::cerr << "FFTDataServer::FillThread::run: exception: " << m_threadError << " (thread = " << this << " from server " << &m_server << ")" << std::endl;
             m_server.fillComplete();
             m_completion = 100;
             m_extent = end;
             return;
         }