comparison data/fileio/FileReadThread.cpp @ 742:c10cb8782576 coreaudio_tests

Merge from branch "default"

 #include "base/Profiler.h"
 #include "base/Thread.h"
 
 #include <iostream>
 #include <unistd.h>
+#include <cstdio>
 
 //#define DEBUG_FILE_READ_THREAD 1
 
 FileReadThread::FileReadThread() :
     m_nextToken(0),

     }
 
     notifyCancelled();
 
 #ifdef DEBUG_FILE_READ_THREAD
-    std::cerr << "FileReadThread::run() exiting" << std::endl;
+    SVDEBUG << "FileReadThread::run() exiting" << endl;
 #endif
 }
 
 void
 FileReadThread::finish()
 {
 #ifdef DEBUG_FILE_READ_THREAD
-    std::cerr << "FileReadThread::finish()" << std::endl;
+    SVDEBUG << "FileReadThread::finish()" << endl;
 #endif
 
     {
         MutexLocker locker(&m_mutex, "FileReadThread::finish::m_mutex");
 

     }
 
     m_condition.wakeAll();
 
 #ifdef DEBUG_FILE_READ_THREAD
-    std::cerr << "FileReadThread::finish() exiting" << std::endl;
+    SVDEBUG << "FileReadThread::finish() exiting" << endl;
 #endif
 }
 
 int
 FileReadThread::request(const Request &request)

             std::cerr << "WARNING: FileReadThread::cancel: token " << token << " not found" << std::endl;
         }
     }
 
 #ifdef DEBUG_FILE_READ_THREAD
-    std::cerr << "FileReadThread::cancel(" << token << ") waking condition" << std::endl;
+    SVDEBUG << "FileReadThread::cancel(" << token << ") waking condition" << endl;
 #endif
 
     m_condition.wakeAll();
 }
 

     Request request = m_queue.begin()->second;
 
     m_mutex.unlock();
 
 #ifdef DEBUG_FILE_READ_THREAD
-    std::cerr << "FileReadThread::process: reading " << request.start << ", " << request.size << " on " << request.fd << std::endl;
+    SVDEBUG << "FileReadThread::process: reading " << request.start << ", " << request.size << " on " << request.fd << endl;
 #endif
 
     bool successful = false;
     bool seekFailed = false;
     ssize_t r = 0;

         
     if (m_queue.find(token) != m_queue.end() && !m_exiting) {
         m_queue.erase(token);
         m_readyRequests[token] = request;
 #ifdef DEBUG_FILE_READ_THREAD
-        std::cerr << "FileReadThread::process: done, marking as ready (success = " << m_readyRequests[token].successful << ")" << std::endl;
+        SVDEBUG << "FileReadThread::process: done, marking as ready (success = " << m_readyRequests[token].successful << ")" << endl;
 #endif
     } else {
 #ifdef DEBUG_FILE_READ_THREAD
         if (m_exiting) {
-            std::cerr << "FileReadThread::process: exiting" << std::endl;
-        } else {
-            std::cerr << "FileReadThread::process: request disappeared" << std::endl;
+            SVDEBUG << "FileReadThread::process: exiting" << endl;
+        } else {
+            SVDEBUG << "FileReadThread::process: request disappeared" << endl;
         }
 #endif
     }
 }
 

     while (!m_newlyCancelled.empty()) {
 
         int token = *m_newlyCancelled.begin();
 
 #ifdef DEBUG_FILE_READ_THREAD
-        std::cerr << "FileReadThread::notifyCancelled: token " << token << std::endl;
+        SVDEBUG << "FileReadThread::notifyCancelled: token " << token << endl;
 #endif
 
         m_newlyCancelled.erase(token);
     }
 }