comparison data/fft/FFTDataServer.cpp @ 205:05154c7bb90b

* Basics of an approximate way of managing memory that we've committed to using
  but haven't allocated yet

     
 #ifdef DEBUG_FFT_SERVER
     std::cerr << "Width " << m_width << ", cache width " << m_cacheWidth << " (size " << m_cacheWidth * columnSize << ")" << std::endl;
 #endif
 
+    StorageAdviser::notifyPlannedAllocation
+        (m_memoryCache ? StorageAdviser::MemoryAllocation :
+                         StorageAdviser::DiscAllocation,
+         m_compactCache ? minimumSize : maximumSize);
+
     for (size_t i = 0; i <= m_width / m_cacheWidth; ++i) {
         m_caches.push_back(0);
     }
 
     m_fftInput = (fftsample *)

     }
 
     QMutexLocker locker(&m_writeMutex);
 
     for (CacheVector::iterator i = m_caches.begin(); i != m_caches.end(); ++i) {
-        delete *i;
+        if (*i) {
+            delete *i;
+        } else {
+            StorageAdviser::notifyDoneAllocation
+                (m_memoryCache ? StorageAdviser::MemoryAllocation :
+                                 StorageAdviser::DiscAllocation,
+                 m_cacheWidth * m_height *
+                 (m_compactCache ? sizeof(uint16_t) : sizeof(float)) / 1024 + 1);
+        }
     }
 
     deleteProcessingData();
 }
 

         }
 
         cache->resize(width, m_height);
         cache->reset();
 
+        StorageAdviser::notifyDoneAllocation
+            (m_memoryCache ? StorageAdviser::MemoryAllocation :
+                             StorageAdviser::DiscAllocation,
+             width * m_height *
+             (m_compactCache ? sizeof(uint16_t) : sizeof(float)) / 1024 + 1);
+
     } catch (std::bad_alloc) {
         std::cerr << "ERROR: Memory allocation failed in FFTFileCache::resize:"
                   << " abandoning this cache" << std::endl;
         //!!! Shouldn't be using QtGui here.  Need a better way to report this.
         QMessageBox::critical