X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOMultiThreadImageReader.cpp;h=3ee50de9a2e558912cfe0d8ac0e489e2cc1cd209;hb=cb539b100d38f3092d06430575f846c916235db4;hp=9d2c0908384742ad939640f2c4fc7ffa57af412e;hpb=6cab96fd8ca99341053a1a6f8a9286940c535313;p=creaImageIO.git

diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index 9d2c090..3ee50de 100644
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -3,6 +3,10 @@
 #include <wx/utils.h>
 #include <creaImageIOSystem.h>
 
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
 namespace creaImageIO
 {
 
@@ -13,6 +17,7 @@ namespace creaImageIO
     vtkImageData* image)
   {
     wxMutexLocker lock(mMultiThreadImageReaderUserMutex);
+
     this->OnMultiThreadImageReaderEvent(filename,type,image);
   }
   //=====================================================================
@@ -30,12 +35,22 @@ namespace creaImageIO
 
     vtkImageData* Read(const std::string& filename);
     
+	struct deleter
+	{
+		void operator()(ThreadedImageReader* p)
+		{
+			p->Delete();
+		}
+	};
+	friend struct deleter;
+
 
   private:
     ImageReader mReader;
     MultiThreadImageReader* mMultiThreadImageReader;
 	
   };
+
   //=====================================================================
 
   
@@ -44,16 +59,20 @@ namespace creaImageIO
     : //mDoNotSignal(false),
       mReader(0),
       mTotalMem(0),
-      mTotalMemMax(1500000)
+      mTotalMemMax(1000000)
   {
     //    std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
     //	      << " #threads= " << number_of_threads <<" )"<<std::endl;
 
+	  mDone = false;
     // Create the threads
     for (int i=0; i<number_of_threads; i++) 
       {
-	ThreadedImageReader* t = new ThreadedImageReader(this);
+		  //ThreadedImageReader* t = new ThreadedImageReader(this);
+		  boost::shared_ptr<ThreadedImageReader> t(new ThreadedImageReader(this), ThreadedImageReader::deleter());
 	mThreadedImageReaderList.push_back(t);
+	 std::cout << "  ===> Thread "<<i
+		      <<" successfully added"<< std::endl;
       }
     mNumberOfThreadedReadersRunning = 0;
     // Init the queue
@@ -90,8 +109,8 @@ namespace creaImageIO
 	  }
 	else 
 	  {
-	    //	    std::cout << "  ===> Thread "<<(*i)->GetCurrentId()
-	    //		      <<" successfully created"<< std::endl;
+	    	    std::cout << "  ===> Thread "<<(*i)->GetCurrentId()
+	    		      <<" successfully created"<< std::endl;
 	    
 	  }
       }
@@ -109,18 +128,21 @@ namespace creaImageIO
 //		    std::cout << "#### MultiThreadImageReader::Stop()"
 //    	      <<std::endl;
   //  std::cout << "Sending stop order to the threads..."<<std::endl;
+	  if (mDone) return;
 
     ThreadedImageReaderListType::iterator i;
     for (i =mThreadedImageReaderList.begin();
 	 i!=mThreadedImageReaderList.end();
 	 i++)
-      {
+      { std::cout << "  ===> Thread "<<(*i)->GetCurrentId()
+	    		      <<" successfully stopped"<< std::endl;
 		  if((*i)->IsAlive())
-		  {
-			(*i)->Delete();
+		  {(*i)->Pause();
+			  (*i).reset();
+			 //			  (*i)->Delete();
 		  }
       }
-    mThreadedImageReaderList.clear();
+   mThreadedImageReaderList.clear();
     // Wait a little to be sure that all threads have stopped
     // A better way to do this ?
     //    wxMilliSleep(1000);
@@ -130,7 +152,7 @@ namespace creaImageIO
     do 
       {
 	// Sleep a little
-	wxMilliSleep(10);
+		wxMilliSleep(10);
 	// Lock
 	{
 	  wxMutexLocker locker(GetMultiThreadImageReaderUserMutex());
@@ -155,6 +177,7 @@ namespace creaImageIO
 	delete j->first;
       }
     mImages.clear();
+	mDone = true;
   }
   //=====================================================================
 
@@ -165,6 +188,7 @@ namespace creaImageIO
     //	      <<std::endl;
     Stop();
     if (mReader) delete mReader;
+	mThreadedImageReaderList.clear();
   }
   //=====================================================================
 
@@ -194,7 +218,7 @@ namespace creaImageIO
 					int priority )
   {
 	wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
-    
+
 	  if (mNumberOfThreadedReadersRunning==0)
 //    if (mThreadedImageReaderList.size()==0) 
       {
@@ -223,7 +247,6 @@ namespace creaImageIO
 	return;
       }
 
-
     ImageToLoad itl(user,filename);
     ImageMapType::iterator i = mImages.find(&itl);
     if (i!=mImages.end())
@@ -279,7 +302,8 @@ namespace creaImageIO
       }
     else if (e==MultiThreadImageReaderUser::ThreadedReaderStopped)
       {
-	mNumberOfThreadedReadersRunning--;
+	
+		 mNumberOfThreadedReadersRunning--;
 	//	std::cout << "#TR=" << mNumberOfThreadedReadersRunning << std::endl;
       }
   }
@@ -289,15 +313,20 @@ namespace creaImageIO
   vtkImageData* MultiThreadImageReader::GetImage(const std::string& filename)
   {
 	 // Start();
-    //    std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
-    //	      <<std::endl;
+    //       std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
+    //		 <<std::endl;
     
     do 
       {
-	wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
+	//	wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
 		
-		  if (mNumberOfThreadedReadersRunning==0)
-//	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);
@@ -320,7 +349,8 @@ namespace creaImageIO
 				 GetMaximalPriorityWithoutLocking()+1);
 	    return pitl->GetImage();
 	  }
-	
+
+	/*	
 	mRequestedFilename = filename;
 	mRequestedImage = 0;
 	ImageToLoad itl(this,filename);
@@ -359,11 +389,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 
@@ -383,7 +415,7 @@ namespace creaImageIO
       }
     while (true);
     // 
-    
+    */
   }
   //=====================================================================
   
@@ -455,7 +487,6 @@ namespace creaImageIO
 
 	GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl);
 
-
 	if (user!=0) 
 	  {
 	    //	    std::cout << "unlock..."<<std::endl;
@@ -466,7 +497,6 @@ namespace creaImageIO
 	       MultiThreadImageReaderUser::ImageUnloaded,
 	       0);
 	    //	    std::cout << "event ok"<<std::endl;
-
 	  }	
 
 	if (unload->Index()>=0)
@@ -486,8 +516,6 @@ namespace creaImageIO
 	//	    std::cout << "delete ok."<<std::endl;
 
       }
-    
-  
   }
   //=====================================================================
 
@@ -537,8 +565,7 @@ namespace creaImageIO
     // While was not deleted 
     while (!TestDestroy())
       {
-	//	std::cout << "### Thread "<<GetCurrentId()<<" waiting for image"
-	//	  << std::endl;
+		//std::cout << "### Thread "<<GetCurrentId()<<" still alive"  << std::endl;
 	  
 	// Lock the mutex
 	mMultiThreadImageReader->MultiThreadImageReaderEventLock();