X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOMultiThreadImageReader.cpp;h=9645f09f163337bb7a217dc95e08de406cf57c40;hb=37692ca5ea7fb8414cb70bcae0ce16e51da57568;hp=053f77e32e0d1a6f30815f0f47eee7d8c0951590;hpb=47344ac4f0a977d14c539921adc2de84808f3df0;p=creaImageIO.git

diff --git a/src2/creaImageIOMultiThreadImageReader.cpp b/src2/creaImageIOMultiThreadImageReader.cpp
index 053f77e..9645f09 100644
--- a/src2/creaImageIOMultiThreadImageReader.cpp
+++ b/src2/creaImageIOMultiThreadImageReader.cpp
@@ -13,6 +13,7 @@ namespace creaImageIO
     vtkImageData* image)
   {
     wxMutexLocker lock(mMultiThreadImageReaderUserMutex);
+
     this->OnMultiThreadImageReaderEvent(filename,type,image);
   }
   //=====================================================================
@@ -30,11 +31,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;
+	
   };
+
   //=====================================================================
 
   
@@ -43,7 +55,7 @@ namespace creaImageIO
     : //mDoNotSignal(false),
       mReader(0),
       mTotalMem(0),
-      mTotalMemMax(100000)
+      mTotalMemMax(1000000)
   {
     //    std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
     //	      << " #threads= " << number_of_threads <<" )"<<std::endl;
@@ -51,8 +63,11 @@ namespace creaImageIO
     // 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
@@ -89,8 +104,8 @@ namespace creaImageIO
 	  }
 	else 
 	  {
-	    //	    std::cout << "  ===> Thread "<<(*i)->GetCurrentId()
-	    //		      <<" successfully created"<< std::endl;
+	    	    std::cout << "  ===> Thread "<<(*i)->GetCurrentId()
+	    		      <<" successfully created"<< std::endl;
 	    
 	  }
       }
@@ -113,10 +128,15 @@ namespace creaImageIO
     for (i =mThreadedImageReaderList.begin();
 	 i!=mThreadedImageReaderList.end();
 	 i++)
-      {
-	(*i)->Delete();
+      { std::cout << "  ===> Thread "<<(*i)->GetCurrentId()
+	    		      <<" successfully stopped"<< std::endl;
+		  if((*i)->IsAlive())
+		  {
+			  (*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);
@@ -126,7 +146,7 @@ namespace creaImageIO
     do 
       {
 	// Sleep a little
-	wxMilliSleep(10);
+		wxMilliSleep(10);
 	// Lock
 	{
 	  wxMutexLocker locker(GetMultiThreadImageReaderUserMutex());
@@ -161,6 +181,7 @@ namespace creaImageIO
     //	      <<std::endl;
     Stop();
     if (mReader) delete mReader;
+	mThreadedImageReaderList.clear();
   }
   //=====================================================================
 
@@ -190,7 +211,7 @@ namespace creaImageIO
 					int priority )
   {
 	wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
-    
+
 	  if (mNumberOfThreadedReadersRunning==0)
 //    if (mThreadedImageReaderList.size()==0) 
       {
@@ -219,7 +240,6 @@ namespace creaImageIO
 	return;
       }
 
-
     ImageToLoad itl(user,filename);
     ImageMapType::iterator i = mImages.find(&itl);
     if (i!=mImages.end())
@@ -275,7 +295,8 @@ namespace creaImageIO
       }
     else if (e==MultiThreadImageReaderUser::ThreadedReaderStopped)
       {
-	mNumberOfThreadedReadersRunning--;
+	
+		 mNumberOfThreadedReadersRunning--;
 	//	std::cout << "#TR=" << mNumberOfThreadedReadersRunning << std::endl;
       }
   }
@@ -285,15 +306,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);
@@ -316,7 +342,8 @@ namespace creaImageIO
 				 GetMaximalPriorityWithoutLocking()+1);
 	    return pitl->GetImage();
 	  }
-	
+
+	/*	
 	mRequestedFilename = filename;
 	mRequestedImage = 0;
 	ImageToLoad itl(this,filename);
@@ -355,11 +382,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 
@@ -379,7 +408,7 @@ namespace creaImageIO
       }
     while (true);
     // 
-    
+    */
   }
   //=====================================================================
   
@@ -437,19 +466,32 @@ 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);
@@ -466,21 +508,7 @@ 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;
-
-	  }
       }
-    
-  
   }
   //=====================================================================
 
@@ -530,8 +558,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();