comparison data/fft/FFTDataServer.cpp @ 550:107d3f3705c9

* Auto-close write-mode matrix files when all columns written

         Profiler profiler("FFTDataServer::getMagnitudeAt: filling");
 #ifdef DEBUG_FFT_SERVER
         std::cerr << "FFTDataServer::getMagnitudeAt: calling fillColumn(" 
                   << x << ")" << std::endl;
 #endif
-        fillColumn(x, cache);
+        fillColumn(x);
     }
     return cache->getMagnitudeAt(col, y);
 }
 
 bool

     if (!cache) return false;
 
     //!!! n.b. can throw
     if (!cache->haveSetColumnAt(col)) {
         Profiler profiler("FFTDataServer::getMagnitudesAt: filling");
-        fillColumn(x, cache);
+        fillColumn(x);
     }
 
     cache->getMagnitudesAt(col, values, minbin, count, step);
 
     return true;

     if (!cache) return 0;
 
     //!!! n.b. can throw
     if (!cache->haveSetColumnAt(col)) {
         Profiler profiler("FFTDataServer::getNormalizedMagnitudeAt: filling");
-        fillColumn(x, cache);
+        fillColumn(x);
     }
     return cache->getNormalizedMagnitudeAt(col, y);
 }
 
 bool

     if (!cache) return false;
 
     //!!! n.b. can throw
     if (!cache->haveSetColumnAt(col)) {
         Profiler profiler("FFTDataServer::getNormalizedMagnitudesAt: filling");
-        fillColumn(x, cache);
+        fillColumn(x);
     }
 
     for (size_t i = 0; i < count; ++i) {
         values[i] = cache->getNormalizedMagnitudeAt(col, i * step + minbin);
     }

     if (!cache) return 0;
 
     //!!! n.b. can throw
     if (!cache->haveSetColumnAt(col)) {
         Profiler profiler("FFTDataServer::getMaximumMagnitudeAt: filling");
-        fillColumn(x, cache);
+        fillColumn(x);
     }
     return cache->getMaximumMagnitudeAt(col);
 }
 
 float

     if (!cache) return 0;
 
     //!!! n.b. can throw
     if (!cache->haveSetColumnAt(col)) {
         Profiler profiler("FFTDataServer::getPhaseAt: filling");
-        fillColumn(x, cache);
+        fillColumn(x);
     }
     return cache->getPhaseAt(col, y);
 }
 
 bool

     if (!cache) return false;
 
     //!!! n.b. can throw
     if (!cache->haveSetColumnAt(col)) {
         Profiler profiler("FFTDataServer::getPhasesAt: filling");
-        fillColumn(x, cache);
+        fillColumn(x);
     }
 
     for (size_t i = 0; i < count; ++i) {
         values[i] = cache->getPhaseAt(col, i * step + minbin);
     }

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

     //!!! n.b. can throw
     return cache->haveSetColumnAt(col);
 }    
 
 void
-FFTDataServer::fillColumn(size_t x, FFTCacheReader *tester)
+FFTDataServer::fillColumn(size_t x)
 {
     Profiler profiler("FFTDataServer::fillColumn", false);
 
     if (!m_model->isReady()) {
         std::cerr << "WARNING: FFTDataServer::fillColumn(" 

               << " from channel " << m_channel << std::endl;
 #endif
 
     QMutexLocker locker(&m_fftBuffersLock);
 
-    if (tester) {
-        // We are being called from a function that wanted to obtain a
-        // column using an FFTCacheReader.  Before calling us, it
-        // checked whether the column was available already, and the
-        // reader reported that it wasn't.  Now we test again with the
-        // mutex held, to avoid a race condition in case another
-        // thread has called fillColumn at the same time.
-        if (tester->haveSetColumnAt(x & m_cacheWidthMask)) {
-            return;
-        }
+    // We may have been called from a function that wanted to obtain a
+    // column using an FFTCacheReader.  Before calling us, it checked
+    // whether the column was available already, and the reader
+    // reported that it wasn't.  Now we test again, with the mutex
+    // held, to avoid a race condition in case another thread has
+    // called fillColumn at the same time.
+    if (cache->haveSetColumnAt(x & m_cacheWidthMask)) {
+        return;
     }
 
     if (!m_fftInput) {
         std::cerr << "WARNING: FFTDataServer::fillColumn(" << x << "): "
                   << "input has already been completed and discarded?"