BUG Threads MacOs

[creaImageIO.git] / src2 / creaImageIOMultiThreadImageReader.cpp

diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index fd76051ab7fbf4704e7baee893d3e9ae5fe26cc7..053f77e32e0d1a6f30815f0f47eee7d8c0951590 100644 (file)
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -1,6 +1,7 @@
 #include <creaImageIOMultiThreadImageReader.h>
 #include <creaImageIOImageReader.h>
 #include <wx/utils.h>
+#include <creaImageIOSystem.h>
 
 namespace creaImageIO
 {
@@ -42,7 +43,7 @@ namespace creaImageIO
     : //mDoNotSignal(false),
       mReader(0),
       mTotalMem(0),
-      mTotalMemMax(10000)
+      mTotalMemMax(100000)
   {
     //    std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
     //       << " #threads= " << number_of_threads <<" )"<<std::endl;
@@ -59,10 +60,10 @@ namespace creaImageIO
     mQueue.set(mIndexer);
     // 
     // no thread : alloc self reader
-    if (number_of_threads==0)
-      {
+//    if (number_of_threads==0)
+//      {
        mReader = new ImageReader();
-      }
+//      }
   }
   //=====================================================================
 
@@ -73,6 +74,8 @@ namespace creaImageIO
 
     //    std::cout << "#### MultiThreadImageReader::Start()"
     //               <<std::endl;
+         if (mNumberOfThreadedReadersRunning > 0) return true;
+         
     ThreadedImageReaderListType::iterator i;
     for (i =mThreadedImageReaderList.begin();
         i!=mThreadedImageReaderList.end();
@@ -186,9 +189,10 @@ namespace creaImageIO
                                        const std::string& filename, 
                                        int priority )
   {
-    wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
+       wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
     
-    if (mThreadedImageReaderList.size()==0) 
+         if (mNumberOfThreadedReadersRunning==0)
+//    if (mThreadedImageReaderList.size()==0) 
       {
        // no detached reader : use self reader
        ImageToLoad itl(user,filename);
@@ -280,7 +284,7 @@ namespace creaImageIO
   //=====================================================================
   vtkImageData* MultiThreadImageReader::GetImage(const std::string& filename)
   {
-    
+        // Start();
     //    std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
     //       <<std::endl;
     
@@ -288,7 +292,8 @@ namespace creaImageIO
       {
        wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
                
-       if (mThreadedImageReaderList.size()==0)
+                 if (mNumberOfThreadedReadersRunning==0)
+//     if (mThreadedImageReaderList.size()==0)
          {
            ImageToLoad itl(this,filename);
            ImageMapType::iterator i = mImages.find(&itl);
@@ -382,7 +387,8 @@ namespace creaImageIO
   void MultiThreadImageReader::SignalImageRead(ImageToLoadPtr p, 
                                               bool purge)
   {
-    //    std::cout << "MultiThreadImageReader::SignalImageRead" <<std::endl;
+    
+//    std::cout << "MultiThreadImageReader::SignalImageRead" <<std::endl;
     //    std::cout << "this="<<this <<std::endl;
     //    std::cout << "user="<<p->GetUser() <<std::endl;
 
@@ -399,6 +405,7 @@ namespace creaImageIO
       BUGGY : TO FIX 
     */
     if (!purge)  return;
+    GimmickMessage(5,"Image '"<<p->GetFilename()<<"' read"<<std::endl);
 
     //    wxMutexLocker lock(GetMultiThreadImageReaderUserMutex());
           
@@ -407,19 +414,25 @@ namespace creaImageIO
     p->GetImage()->PropagateUpdateExtent();
     long ImMem = p->GetImage()->GetEstimatedMemorySize();
     mTotalMem += ImMem;
-    //    std::cout << " ==> Total mem = "<<mTotalMem<<" Ko"<<std::endl;
+
+    GimmickMessage(5,"==> Image in memory = "<<mUnloadQueue.size()<<std::endl);
+    GimmickMessage(5,"==> Total mem       = "<<mTotalMem<<" Ko"<<std::endl);
+
+    //  return;
+
     while (mTotalMem > mTotalMemMax)
       {
-       //      std::cout 
-       //                <<"   ! Exceeded max of "
-       //                << mTotalMemMax << " : unloading oldest image ... "
-       //                << std::endl;
+       GimmickMessage(5,
+                      "   ! Exceeded max of "
+                      << mTotalMemMax << " Ko : unloading oldest image ... "
+                      << std::endl);
        if ( mUnloadQueue.size() <= 1 ) 
          {
-           //      std::cout << "Only one image : cannot load AND unload it !!"
-           //                <<std::endl;
+            GimmickMessage(5,
+                           "   Only one image : cannot load AND unload it !!"
+                           <<std::endl);
            break; 
-
+           
          }
        ImageToLoadPtr unload = mUnloadQueue.remove_top();
        MultiThreadImageReaderUser* user = unload->GetUser();
@@ -430,15 +443,16 @@ namespace creaImageIO
          }
 
 
-       //      std::cout << "'" << unload->GetFilename() << "'" << std::endl;
+       GimmickMessage(5,"'" << unload->GetFilename() << "'" << std::endl);
        mTotalMem -= unload->GetImage()->GetEstimatedMemorySize();
-       //      std::cout << " ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl;
+
+       GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl);
        
 
        std::string filename = unload->GetFilename();
        if (unload->Index()>=0)
          {
-           //   std::cout << "still in queue"<<std::endl;
+           // GimmickMessage(5,"still in queue"<<std::endl);
          }
        unload->Index() = -1;