comparison data/fft/FFTDataServer.cpp @ 690:1424aa29ae95

Seems to be a bad idea to use plain DEBUG symbol on OS/X (system wants it)

                 distance += ((server->getFFTSize() / fftSize) - 1) * 10;
                 
                 if (server->getFillCompletion() < 50) distance += 100;
 
 #ifdef DEBUG_FFT_SERVER
-                DEBUG << "FFTDataServer::getFuzzyInstance: Distance for server " << server << " is " << distance << ", best is " << bestdist << endl;
+                SVDEBUG << "FFTDataServer::getFuzzyInstance: Distance for server " << server << " is " << distance << ", best is " << bestdist << endl;
 #endif
                 
                 if (bestdist == -1 || distance < bestdist) {
                     bestdist = distance;
                     best = i;

         }
 
         if (bestdist >= 0) {
             FFTDataServer *server = best->second.first;
 #ifdef DEBUG_FFT_SERVER
-            DEBUG << "FFTDataServer::getFuzzyInstance: We like server " << server << " (with distance " << bestdist << ")" << endl;
+            SVDEBUG << "FFTDataServer::getFuzzyInstance: We like server " << server << " (with distance " << bestdist << ")" << endl;
 #endif
             claimInstance(server, false);
             return server;
         }
     }

 
 FFTDataServer *
 FFTDataServer::findServer(QString n)
 {    
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::findServer(\"" << n << "\")" << endl;
+    SVDEBUG << "FFTDataServer::findServer(\"" << n << "\")" << endl;
 #endif
 
     if (m_servers.find(n) != m_servers.end()) {
 
         FFTDataServer *server = m_servers[n].first;
 
 #ifdef DEBUG_FFT_SERVER
-        DEBUG << "FFTDataServer::findServer(\"" << n << "\"): found " << server << endl;
+        SVDEBUG << "FFTDataServer::findServer(\"" << n << "\"): found " << server << endl;
 #endif
 
         claimInstance(server, false);
 
         return server;
     }
 
 #ifdef DEBUG_FFT_SERVER
-        DEBUG << "FFTDataServer::findServer(\"" << n << "\"): not found" << endl;
+        SVDEBUG << "FFTDataServer::findServer(\"" << n << "\"): not found" << endl;
 #endif
 
     return 0;
 }
 

 {
     MutexLocker locker(needLock ? &m_serverMapMutex : 0,
                        "FFTDataServer::claimInstance::m_serverMapMutex");
 
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::claimInstance(" << server << ")" << endl;
+    SVDEBUG << "FFTDataServer::claimInstance(" << server << ")" << endl;
 #endif
 
     for (ServerMap::iterator i = m_servers.begin(); i != m_servers.end(); ++i) {
         if (i->second.first == server) {
 
             for (ServerQueue::iterator j = m_releasedServers.begin();
                  j != m_releasedServers.end(); ++j) {
 
                 if (*j == server) {
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::claimInstance: found in released server list, removing from it" << endl;
+    SVDEBUG << "FFTDataServer::claimInstance: found in released server list, removing from it" << endl;
 #endif
                     m_releasedServers.erase(j);
                     break;
                 }
             }
 
             ++i->second.second;
 
 #ifdef DEBUG_FFT_SERVER
-            DEBUG << "FFTDataServer::claimInstance: new refcount is " << i->second.second << endl;
+            SVDEBUG << "FFTDataServer::claimInstance: new refcount is " << i->second.second << endl;
 #endif
 
             return;
         }
     }

 {    
     MutexLocker locker(needLock ? &m_serverMapMutex : 0,
                        "FFTDataServer::releaseInstance::m_serverMapMutex");
 
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::releaseInstance(" << server << ")" << endl;
+    SVDEBUG << "FFTDataServer::releaseInstance(" << server << ")" << endl;
 #endif
 
     // -- if ref count > 0, decrement and return
     // -- if the instance hasn't been used at all, delete it immediately 
     // -- if fewer than N instances (N = e.g. 3) remain with zero refcounts,

                           << server << "): instance not allocated" << std::endl;
             } else if (--i->second.second == 0) {
 /*!!!
                 if (server->m_lastUsedCache == -1) { // never used
 #ifdef DEBUG_FFT_SERVER
-                    DEBUG << "FFTDataServer::releaseInstance: instance "
+                    SVDEBUG << "FFTDataServer::releaseInstance: instance "
                               << server << " has never been used, erasing"
                               << endl;
 #endif
                     delete server;
                     m_servers.erase(i);
                 } else {
 */
 #ifdef DEBUG_FFT_SERVER
-                    DEBUG << "FFTDataServer::releaseInstance: instance "
+                    SVDEBUG << "FFTDataServer::releaseInstance: instance "
                               << server << " no longer in use, marking for possible collection"
                               << endl;
 #endif
                     bool found = false;
                     for (ServerQueue::iterator j = m_releasedServers.begin();

                     server->suspend();
                     purgeLimbo();
 //!!!                }
             } else {
 #ifdef DEBUG_FFT_SERVER
-                    DEBUG << "FFTDataServer::releaseInstance: instance "
+                    SVDEBUG << "FFTDataServer::releaseInstance: instance "
                               << server << " now has refcount " << i->second.second
                               << endl;
 #endif
             }
             return;

 
 void
 FFTDataServer::purgeLimbo(int maxSize)
 {
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::purgeLimbo(" << maxSize << "): "
+    SVDEBUG << "FFTDataServer::purgeLimbo(" << maxSize << "): "
               << m_releasedServers.size() << " candidates" << endl;
 #endif
 
     while (int(m_releasedServers.size()) > maxSize) {
 
         FFTDataServer *server = *m_releasedServers.begin();
 
         bool found = false;
 
 #ifdef DEBUG_FFT_SERVER
-        DEBUG << "FFTDataServer::purgeLimbo: considering candidate "
+        SVDEBUG << "FFTDataServer::purgeLimbo: considering candidate "
                   << server << endl;
 #endif
 
         for (ServerMap::iterator i = m_servers.begin(); i != m_servers.end(); ++i) {
 

                               << i->second.second << std::endl;
                     // ... so don't delete it
                     break;
                 }
 #ifdef DEBUG_FFT_SERVER
-                DEBUG << "FFTDataServer::purgeLimbo: looks OK, erasing it"
+                SVDEBUG << "FFTDataServer::purgeLimbo: looks OK, erasing it"
                           << endl;
 #endif
 
                 m_servers.erase(i);
                 delete server;

 
         m_releasedServers.pop_front();
     }
 
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::purgeLimbo(" << maxSize << "): "
+    SVDEBUG << "FFTDataServer::purgeLimbo(" << maxSize << "): "
               << m_releasedServers.size() << " remain" << endl;
 #endif
 
 }
 

 {
     MutexLocker locker(&m_serverMapMutex,
                        "FFTDataServer::modelAboutToBeDeleted::m_serverMapMutex");
 
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::modelAboutToBeDeleted(" << model << ")"
+    SVDEBUG << "FFTDataServer::modelAboutToBeDeleted(" << model << ")"
               << endl;
 #endif
 
     for (ServerMap::iterator i = m_servers.begin(); i != m_servers.end(); ++i) {
         
         FFTDataServer *server = i->second.first;
 
         if (server->getModel() == model) {
 
 #ifdef DEBUG_FFT_SERVER
-            DEBUG << "FFTDataServer::modelAboutToBeDeleted: server is "
+            SVDEBUG << "FFTDataServer::modelAboutToBeDeleted: server is "
                       << server << endl;
 #endif
 
             if (i->second.second > 0) {
                 std::cerr << "WARNING: FFTDataServer::modelAboutToBeDeleted: Model " << model << " (\"" << model->objectName() << "\") is about to be deleted, but is still being referred to by FFT server " << server << " with non-zero refcount " << i->second.second << std::endl;

             }
             for (ServerQueue::iterator j = m_releasedServers.begin();
                  j != m_releasedServers.end(); ++j) {
                 if (*j == server) {
 #ifdef DEBUG_FFT_SERVER
-                    DEBUG << "FFTDataServer::modelAboutToBeDeleted: erasing from released servers" << endl;
+                    SVDEBUG << "FFTDataServer::modelAboutToBeDeleted: erasing from released servers" << endl;
 #endif
                     m_releasedServers.erase(j);
                     break;
                 }
             }
 #ifdef DEBUG_FFT_SERVER
-            DEBUG << "FFTDataServer::modelAboutToBeDeleted: erasing server" << endl;
+            SVDEBUG << "FFTDataServer::modelAboutToBeDeleted: erasing server" << endl;
 #endif
             m_servers.erase(i);
             delete server;
             return;
         }

 FFTDataServer::makeCacheReader(int c)
 {
     // preconditions: m_caches[c] exists and contains a file writer;
     // m_cacheVectorLock is not locked by this thread
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::makeCacheReader(" << c << ")" << endl;
+    SVDEBUG << "FFTDataServer::makeCacheReader(" << c << ")" << endl;
 #endif
 
     QThread *me = QThread::currentThread();
     QWriteLocker locker(&m_cacheVectorLock);
     CacheBlock *cb(m_caches.at(c));

     }
 
     cb = m_caches.at(deleteCandidate);
     if (cb && cb->fileCacheReader.find(me) != cb->fileCacheReader.end()) {
 #ifdef DEBUG_FFT_SERVER
-        DEBUG << "FFTDataServer::makeCacheReader: Deleting probably unpopular reader " << deleteCandidate << " for this thread (as I create reader " << c << ")" << endl;
+        SVDEBUG << "FFTDataServer::makeCacheReader: Deleting probably unpopular reader " << deleteCandidate << " for this thread (as I create reader " << c << ")" << endl;
 #endif
         delete cb->fileCacheReader[me];
         cb->fileCacheReader.erase(me);
     }
             

         if (!cache) return 0;
 
         if (!cache->haveSetColumnAt(col)) {
             Profiler profiler("FFTDataServer::getMagnitudeAt: filling");
 #ifdef DEBUG_FFT_SERVER
-            DEBUG << "FFTDataServer::getMagnitudeAt: calling fillColumn(" 
+            SVDEBUG << "FFTDataServer::getMagnitudeAt: calling fillColumn(" 
                   << x << ")" << endl;
 #endif
             fillColumn(x);
         }
 

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

 
     if (!haveCache(x)) {
 /*!!!
         if (m_lastUsedCache == -1) {
             if (m_suspended) {
-                DEBUG << "FFTDataServer::isColumnReady(" << x << "): no cache, calling resume" << endl;
+                SVDEBUG << "FFTDataServer::isColumnReady(" << x << "): no cache, calling resume" << endl;
                 resume();
             }
             m_fillThread->start();
         }
 */

 
     startFrame -= winsize / 2;
     endFrame   -= winsize / 2;
 
 #ifdef DEBUG_FFT_SERVER_FILL
-    DEBUG << "FFTDataServer::fillColumn: requesting frames "
+    SVDEBUG << "FFTDataServer::fillColumn: requesting frames "
               << startFrame + pfx << " -> " << endFrame << " ( = "
               << endFrame - (startFrame + pfx) << ") at index "
               << off + pfx << " in buffer of size " << m_fftSize
               << " with window size " << m_windowSize 
               << " from channel " << m_channel << endl;

                            m_workbuffer,
                            m_workbuffer + hs + 1);
     }
 
     if (m_suspended) {
-//        DEBUG << "FFTDataServer::fillColumn(" << x << "): calling resume" << endl;
+//        SVDEBUG << "FFTDataServer::fillColumn(" << x << "): calling resume" << endl;
 //        resume();
     }
 }    
 
 void

 
 void
 FFTDataServer::FillThread::run()
 {
 #ifdef DEBUG_FFT_SERVER_FILL
-    DEBUG << "FFTDataServer::FillThread::run()" << endl;
+    SVDEBUG << "FFTDataServer::FillThread::run()" << endl;
 #endif
     
     m_extent = 0;
     m_completion = 0;
     
     while (!m_server.m_model->isReady() && !m_server.m_exiting) {
 #ifdef DEBUG_FFT_SERVER_FILL
-        DEBUG << "FFTDataServer::FillThread::run(): waiting for model " << m_server.m_model << " to be ready" << endl;
+        SVDEBUG << "FFTDataServer::FillThread::run(): waiting for model " << m_server.m_model << " to be ready" << endl;
 #endif
         sleep(1);
     }
     if (m_server.m_exiting) return;
 

         for (size_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) {
-                DEBUG << "FFTDataServer::FillThread::run: exception: " << e.what() << endl;
+                SVDEBUG << "FFTDataServer::FillThread::run: exception: " << e.what() << endl;
                 m_error = e.what();
                 m_server.fillComplete();
                 m_completion = 100;
                 m_extent = end;
                 return;

     for (size_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) {
-            DEBUG << "FFTDataServer::FillThread::run: exception: " << e.what() << endl;
+            SVDEBUG << "FFTDataServer::FillThread::run: exception: " << e.what() << endl;
             m_error = e.what();
             m_server.fillComplete();
             m_completion = 100;
             m_extent = end;
             return;

     m_server.fillComplete();
     m_completion = 100;
     m_extent = end;
 
 #ifdef DEBUG_FFT_SERVER
-    DEBUG << "FFTDataServer::FillThread::run exiting" << endl;
-#endif
-}
-
+    SVDEBUG << "FFTDataServer::FillThread::run exiting" << endl;
+#endif
+}
+