vtkImageData* image)
{
wxMutexLocker lock(mMultiThreadImageReaderUserMutex);
+
this->OnMultiThreadImageReaderEvent(filename,type,image);
}
//=====================================================================
private:
ImageReader mReader;
MultiThreadImageReader* mMultiThreadImageReader;
+
};
//=====================================================================
: //mDoNotSignal(false),
mReader(0),
mTotalMem(0),
- mTotalMemMax(1500000)
+ mTotalMemMax(1000000)
{
// std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
// << " #threads= " << number_of_threads <<" )"<<std::endl;
{
ThreadedImageReader* t = new ThreadedImageReader(this);
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)->Delete();
+ }
}
mThreadedImageReaderList.clear();
// Wait a little to be sure that all threads have stopped
do
{
// Sleep a little
- wxMilliSleep(10);
+ wxMilliSleep(10);
// Lock
{
wxMutexLocker locker(GetMultiThreadImageReaderUserMutex());
}
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);
//
-
+ */
}
//=====================================================================
// 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();