*** empty log message ***

[creaImageIO.git] / src2 / creaImageIOMultiThreadImageReader.cpp

diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index 717b09cb89699f7adf87afb3f5be9f79e1719d72..9e4db3ced7ebd1bce3a3c987630dca2ae13adfa9 100644 (file)
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -34,6 +34,7 @@ namespace creaImageIO
   private:
     ImageReader mReader;
     MultiThreadImageReader* mMultiThreadImageReader;
+       
   };
   //=====================================================================
 
@@ -43,7 +44,7 @@ namespace creaImageIO
     : //mDoNotSignal(false),
       mReader(0),
       mTotalMem(0),
-      mTotalMemMax(100000)
+      mTotalMemMax(1000000)
   {
     //    std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
     //       << " #threads= " << number_of_threads <<" )"<<std::endl;
@@ -60,10 +61,10 @@ namespace creaImageIO
     mQueue.set(mIndexer);
     // 
     // no thread : alloc self reader
-    if (number_of_threads==0)
-      {
+//    if (number_of_threads==0)
+//      {
        mReader = new ImageReader();
-      }
+//      }
   }
   //=====================================================================
 
@@ -74,6 +75,8 @@ namespace creaImageIO
 
     //    std::cout << "#### MultiThreadImageReader::Start()"
     //               <<std::endl;
+         if (mNumberOfThreadedReadersRunning > 0) return true;
+         
     ThreadedImageReaderListType::iterator i;
     for (i =mThreadedImageReaderList.begin();
         i!=mThreadedImageReaderList.end();
@@ -112,7 +115,10 @@ namespace creaImageIO
         i!=mThreadedImageReaderList.end();
         i++)
       {
-       (*i)->Delete();
+                 if((*i)->IsAlive())
+                 {
+                       (*i)->Delete();
+                 }
       }
     mThreadedImageReaderList.clear();
     // Wait a little to be sure that all threads have stopped
@@ -187,9 +193,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);
@@ -281,15 +288,21 @@ namespace creaImageIO
   //=====================================================================
   vtkImageData* MultiThreadImageReader::GetImage(const std::string& filename)
   {
-    
-    //    std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
-    //       <<std::endl;
+        // Start();
+    //       std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
+    //          <<std::endl;
     
     do 
       {
-       wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
+       //      wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
                
-       if (mThreadedImageReaderList.size()==0)
+       //     std::cout << "** MultiThreadImageReader::GetImage('"<<filename
+       //             <<"') lock ok"
+       //               <<std::endl;
+    
+       //                if (mNumberOfThreadedReadersRunning==0)
+       //      if (mThreadedImageReaderList.size()==0)
+       if (true)
          {
            ImageToLoad itl(this,filename);
            ImageMapType::iterator i = mImages.find(&itl);
@@ -312,7 +325,8 @@ namespace creaImageIO
                                 GetMaximalPriorityWithoutLocking()+1);
            return pitl->GetImage();
          }
-       
+
+       /*      
        mRequestedFilename = filename;
        mRequestedImage = 0;
        ImageToLoad itl(this,filename);
@@ -351,11 +365,13 @@ namespace creaImageIO
            mImages[pitl] = 0;
            mQueue.insert(pitl);
          }
+       */
       }
     while (0);
 
     //    std::cout << "Waiting..."<<std::endl;
 
+    /*
     // Waiting that it is read
     int n = 0;
     do 
@@ -375,7 +391,7 @@ namespace creaImageIO
       }
     while (true);
     // 
-    
+    */
   }
   //=====================================================================
   
@@ -433,19 +449,34 @@ namespace creaImageIO
        ImageToLoadPtr unload = mUnloadQueue.remove_top();
        MultiThreadImageReaderUser* user = unload->GetUser();
 
+       /*
        if ((user!=0)&&(user!=this)) 
          {
            user->GetMultiThreadImageReaderUserMutex().Lock();
          }
+       */
 
+       std::string filename = unload->GetFilename();
 
-       GimmickMessage(5,"'" << unload->GetFilename() << "'" << std::endl);
+       GimmickMessage(5,"'" << filename << "'" << std::endl);
        mTotalMem -= unload->GetImage()->GetEstimatedMemorySize();
 
        GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl);
-       
 
-       std::string filename = unload->GetFilename();
+
+       if (user!=0) 
+         {
+           //      std::cout << "unlock..."<<std::endl;
+           //   user->GetMultiThreadImageReaderUserMutex().Unlock();
+           //      std::cout << "event"<<std::endl;
+           user->MultiThreadImageReaderSendEvent
+             (filename,
+              MultiThreadImageReaderUser::ImageUnloaded,
+              0);
+           //      std::cout << "event ok"<<std::endl;
+
+         }     
+
        if (unload->Index()>=0)
          {
            // GimmickMessage(5,"still in queue"<<std::endl);
@@ -462,18 +493,6 @@ namespace creaImageIO
        delete unload;
        //          std::cout << "delete ok."<<std::endl;
 
-       if (user!=0) 
-         {
-           //      std::cout << "unlock..."<<std::endl;
-           user->GetMultiThreadImageReaderUserMutex().Unlock();
-           //      std::cout << "event"<<std::endl;
-           user->MultiThreadImageReaderSendEvent
-             (filename,
-              MultiThreadImageReaderUser::ImageUnloaded,
-              0);
-           //      std::cout << "event ok"<<std::endl;
-
-         }
       }