#include <wx/utils.h>
#include <creaImageIOSystem.h>
-
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
namespace creaImageIO
{
};
-
//=====================================================================
// std::cout << "#### MultiThreadImageReader::MultiThreadImageReader("
// << " #threads= " << number_of_threads <<" )"<<std::endl;
+ mDone = false;
// Create the threads
for (int i=0; i<number_of_threads; i++)
{
boost::shared_ptr<ThreadedImageReader> t(new ThreadedImageReader(this), ThreadedImageReader::deleter());
mThreadedImageReaderList.push_back(t);
std::cout << " ===> Thread "<<i
- <<" successfully added"<< std::endl;
+ <<" successfully added"<< std::endl;
}
mNumberOfThreadedReadersRunning = 0;
// Init the queue
// 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();
{ 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);
delete j->first;
}
mImages.clear();
+ mDone = true;
}
//=====================================================================
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())
GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl);
-
if (user!=0)
{
// std::cout << "unlock..."<<std::endl;
MultiThreadImageReaderUser::ImageUnloaded,
0);
// std::cout << "event ok"<<std::endl;
-
}
if (unload->Index()>=0)
// std::cout << "delete ok."<<std::endl;
}
-
-
}
//=====================================================================