vtkImageData* image)
{
wxMutexLocker lock(mMultiThreadImageReaderUserMutex);
+
this->OnMultiThreadImageReaderEvent(filename,type,image);
}
//=====================================================================
vtkImageData* Read(const std::string& filename);
+ struct deleter
+ {
+ void operator()(ThreadedImageReader* p)
+ {
+ p->Delete();
+ }
+ };
+ friend struct deleter;
+
private:
ImageReader mReader;
MultiThreadImageReader* mMultiThreadImageReader;
+
};
+
//=====================================================================
: //mDoNotSignal(false),
mReader(0),
mTotalMem(0),
- mTotalMemMax(100000)
+ mTotalMemMax(1000000)
{
// std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
// << " #threads= " << number_of_threads <<" )"<<std::endl;
// 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
}
else
{
- // std::cout << " ===> Thread "<<(*i)->GetCurrentId()
- // <<" successfully created"<< std::endl;
+ std::cout << " ===> Thread "<<(*i)->GetCurrentId()
+ <<" successfully created"<< std::endl;
}
}
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);
do
{
// Sleep a little
- wxMilliSleep(10);
+ wxMilliSleep(10);
// Lock
{
wxMutexLocker locker(GetMultiThreadImageReaderUserMutex());
// <<std::endl;
Stop();
if (mReader) delete mReader;
+ mThreadedImageReaderList.clear();
}
//=====================================================================
int priority )
{
wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
-
+
if (mNumberOfThreadedReadersRunning==0)
// if (mThreadedImageReaderList.size()==0)
{
return;
}
-
ImageToLoad itl(user,filename);
ImageMapType::iterator i = mImages.find(&itl);
if (i!=mImages.end())
}
else if (e==MultiThreadImageReaderUser::ThreadedReaderStopped)
{
- mNumberOfThreadedReadersRunning--;
+
+ mNumberOfThreadedReadersRunning--;
// std::cout << "#TR=" << mNumberOfThreadedReadersRunning << std::endl;
}
}
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);
GetMaximalPriorityWithoutLocking()+1);
return pitl->GetImage();
}
-
+
+ /*
mRequestedFilename = filename;
mRequestedImage = 0;
ImageToLoad itl(this,filename);
mImages[pitl] = 0;
mQueue.insert(pitl);
}
+ */
}
while (0);
// std::cout << "Waiting..."<<std::endl;
+ /*
// Waiting that it is read
int n = 0;
do
}
while (true);
//
-
+ */
}
//=====================================================================
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);
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;
-
- }
}
-
-
}
//=====================================================================
// 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();