X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOMultiThreadImageReader.cpp;h=9e4db3ced7ebd1bce3a3c987630dca2ae13adfa9;hb=46fb4b43011a4043c7b5ef2e7bd57e1695cd6b7f;hp=fd76051ab7fbf4704e7baee893d3e9ae5fe26cc7;hpb=cbf693fa62cd51f4ca5c881838bbb609edc447b0;p=creaImageIO.git

diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index fd76051..9e4db3c 100644
--- 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
 {
@@ -33,6 +34,7 @@ namespace creaImageIO
   private:
     ImageReader mReader;
     MultiThreadImageReader* mMultiThreadImageReader;
+	
   };
   //=====================================================================
 
@@ -42,7 +44,7 @@ namespace creaImageIO
     : //mDoNotSignal(false),
       mReader(0),
       mTotalMem(0),
-      mTotalMemMax(10000)
+      mTotalMemMax(1000000)
   {
     //    std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
     //	      << " #threads= " << number_of_threads <<" )"<<std::endl;
@@ -59,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();
-      }
+//      }
   }
   //=====================================================================
 
@@ -73,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();
@@ -111,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
@@ -186,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);
@@ -280,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);
@@ -311,7 +325,8 @@ namespace creaImageIO
 				 GetMaximalPriorityWithoutLocking()+1);
 	    return pitl->GetImage();
 	  }
-	
+
+	/*	
 	mRequestedFilename = filename;
 	mRequestedImage = 0;
 	ImageToLoad itl(this,filename);
@@ -350,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 
@@ -374,7 +391,7 @@ namespace creaImageIO
       }
     while (true);
     // 
-    
+    */
   }
   //=====================================================================
   
@@ -382,7 +399,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 +417,7 @@ namespace creaImageIO
       BUGGY : TO FIX 
     */
     if (!purge)  return;
+    GimmickMessage(5,"Image '"<<p->GetFilename()<<"' read"<<std::endl);
 
     //    wxMutexLocker lock(GetMultiThreadImageReaderUserMutex());
 	   
@@ -407,38 +426,60 @@ 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();
 
+	/*
 	if ((user!=0)&&(user!=this)) 
 	  {
 	    user->GetMultiThreadImageReaderUserMutex().Lock();
 	  }
+	*/
 
+	std::string filename = unload->GetFilename();
 
-	//	std::cout << "'" << unload->GetFilename() << "'" << std::endl;
+	GimmickMessage(5,"'" << filename << "'" << std::endl);
 	mTotalMem -= unload->GetImage()->GetEstimatedMemorySize();
-	//	std::cout << " ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl;
-	
 
-	std::string filename = unload->GetFilename();
+	GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<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;
+
+	  }	
+
 	if (unload->Index()>=0)
 	  {
-	    //   std::cout << "still in queue"<<std::endl;
+	    // GimmickMessage(5,"still in queue"<<std::endl);
 	  }
 	unload->Index() = -1;
 
@@ -452,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;
-
-	  }
       }