+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+# pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+# This software is governed by the CeCILL-B license under French law and
+# abiding by the rules of distribution of free software. You can use,
+# modify and/ or redistribute the software under the terms of the CeCILL-B
+# license as circulated by CEA, CNRS and INRIA at the following URL
+# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+# or in the file LICENSE.txt.
+#
+# As a counterpart to the access to the source code and rights to copy,
+# modify and redistribute granted by the license, users are provided only
+# with a limited warranty and the software's author, the holder of the
+# economic rights, and the successive licensors have only limited
+# liability.
+#
+# The fact that you are presently reading this means that you have had
+# knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------
+*/
+
+
#include <creaImageIOMultiThreadImageReader.h>
#include <creaImageIOImageReader.h>
#include <wx/utils.h>
+#include <creaImageIOSystem.h>
+
+ #include <creaImageIODicomImageReader.h>
+
+#include <creaImageIOGimmick.h>
+#ifdef _DEBUG
+#define new DEBUG_NEW
+#endif
namespace creaImageIO
{
}
//=====================================================================
+ class wxThreadEED2
+ {
+ public:
+ void Delete() { printf("EED wxThreadEED2::Delete() \n"); }
+ int Run() { printf("EED wxThreadEED2::Run() \n"); return 0;}
+ void Pause() { printf("EED wxThreadEED2::Pause() \n"); }
+ void Create() { printf("EED wxThreadEED2::Create() \n"); }
+ bool IsAlive() { printf("EED wxThreadEED2::IsAlive() \n"); return false; }
+ bool TestDestroy() { printf("EED wxThreadEED2::TestDestroy() \n"); return false; }
+ int GetCurrentId() { printf("EED wxThreadEED2::GetCurrentId() \n"); return -999; }
+ };
+
//=====================================================================
- class ThreadedImageReader: public wxThread
+//EED 2018-08-20
+// class ThreadedImageReader: public wxThread
+ class ThreadedImageReader: public wxThreadEED2
{
public:
ThreadedImageReader(MultiThreadImageReader* tir) :
mMultiThreadImageReader(tir)
{}
-
void* Entry();
void OnExit();
-
vtkImageData* Read(const std::string& filename);
-
+ struct deleter
+ {
+ void operator()(ThreadedImageReader* p)
+ {
+ p->Delete();
+ }
+ };
+ friend struct deleter;
private:
ImageReader mReader;
MultiThreadImageReader* mMultiThreadImageReader;
};
+
//=====================================================================
//=====================================================================
MultiThreadImageReader::MultiThreadImageReader(int number_of_threads)
: //mDoNotSignal(false),
- mReader(0),
+ mReader(NULL),
mTotalMem(0),
- mTotalMemMax(10000)
+ 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);
- mThreadedImageReaderList.push_back(t);
- }
+ {
+ //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;
+ } // for
mNumberOfThreadedReadersRunning = 0;
// Init the queue
mQueue.set(mComparator);
mQueue.set(mIndexer);
//
// no thread : alloc self reader
- if (number_of_threads==0)
- {
+// if (number_of_threads==0)
+// {
mReader = new ImageReader();
- }
+// }
}
//=====================================================================
//=====================================================================
bool MultiThreadImageReader::Start()
{
-
// std::cout << "#### MultiThreadImageReader::Start()"
// <<std::endl;
+ if (mNumberOfThreadedReadersRunning > 0) return true;
+
ThreadedImageReaderListType::iterator i;
for (i =mThreadedImageReaderList.begin();
i!=mThreadedImageReaderList.end();
i++)
- {
- (*i)->Create();
- if ( (*i)->Run() != wxTHREAD_NO_ERROR )
- {
- std::cout << "ERROR starting a thread"<< std::endl;
- return false;
- }
- else
- {
- // std::cout << " ===> Thread "<<(*i)->GetCurrentId()
- // <<" successfully created"<< std::endl;
-
- }
- }
- wxMutexLocker locker(GetMultiThreadImageReaderUserMutex());
- // std::cout << "EO Start : #Threads running = "
- // << mNumberOfThreadedReadersRunning<<std::endl;
-
+ {
+ (*i)->Create();
+ if ( (*i)->Run() != wxTHREAD_NO_ERROR )
+ {
+ std::cout << "ERROR starting a thread"<< std::endl;
+ return false;
+ } else {
+ std::cout << " ===> Thread "<<(*i)->GetCurrentId()
+ <<" successfully created"<< std::endl;
+ } // if
+ } // for
+ wxMutexLocker locker(GetMultiThreadImageReaderUserMutex());
+ // std::cout << "EO Start : #Threads running = "
+ // << mNumberOfThreadedReadersRunning<<std::endl;
return true;
}
//=====================================================================
// 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++)
- {
- (*i)->Delete();
- }
- mThreadedImageReaderList.clear();
+ {
+ std::cout << " ===> Thread "<<(*i)->GetCurrentId()
+ <<" successfully stopped"<< std::endl;
+ if((*i)->IsAlive())
+ {
+ (*i)->Pause();
+ (*i).reset();
+// (*i)->Delete();
+ } // if i
+ } // for
+ 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());
while (true);
// std::cout << "All threads stopped : OK "<<std::endl;
- ImageMapType::iterator j;
- for (j =mImages.begin();
- j!=mImages.end();
- ++j)
- {
- delete j->first;
- }
- mImages.clear();
+ CleanMImagesMap();
+
+ mDone = true;
+
}
//=====================================================================
+
+ void MultiThreadImageReader::CleanMImagesMap()
+ {
+ ImageMapType::iterator j;
+ for (j=mImages.begin(); j!=mImages.end(); ++j)
+ {
+ delete j->first;
+ } //for
+ mImages.clear();
+ }
+
//=====================================================================
MultiThreadImageReader::~MultiThreadImageReader()
{
// <<std::endl;
Stop();
if (mReader) delete mReader;
+ mThreadedImageReaderList.clear();
+
+ CleanMImagesMap();
+
+/*
+ ImageMapType::iterator it;
+ for (it=mImages.begin() ; it!=mImages.end(); it++)
+ {
+ printf("MultiThreadImageReader::~MultiThreadImageReader %s ", it.first->GetFilename() );
+ } // for it
+*/
+
}
//=====================================================================
}
}
//=====================================================================
+ // function to read attributes for a file
+ void MultiThreadImageReader::getAttributes(const std::string filename,
+ std::map <std::string , std::string> &infos,std::vector<std::string> i_attr)
+ {
+ mReader->getAttributes(filename, infos, i_attr);
+ }
//=====================================================================
void MultiThreadImageReader::Request( MultiThreadImageReaderUser* user,
const std::string& filename,
int priority )
{
- wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
-
- if (mThreadedImageReaderList.size()==0)
+ wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
+
+ if (mNumberOfThreadedReadersRunning==0)
+// if (mThreadedImageReaderList.size()==0)
{
// no detached reader : use self reader
ImageToLoad itl(user,filename);
}
ImageToLoadPtr pitl = new ImageToLoad(user,filename,0);
mImages[pitl] = 0;
- pitl->SetImage(mReader->Read(filename));
+ pitl->SetImage(mReader->ReadImage(filename));
UpdateUnloadPriority(pitl,priority);
SignalImageRead(pitl,true);
// return pitl->GetImage();
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)
{
-
- // std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
- // <<std::endl;
+ // Start();
+ // std::cout << "** MultiThreadImageReader::GetImage('"<<filename<<"')"
+ // <<std::endl;
do
{
- wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
+ // wxMutexLocker lock(GetMultiThreadImageReaderUserMutex()); //mMutex);
- 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);
if (i!=mImages.end())
- {
- ImageToLoadPtr pitl = const_cast<ImageToLoadPtr>(i->first);
- // Already inserted
- if (pitl->GetImage() != 0)
- {
- // Already read
- UpdateUnloadPriority(pitl,
- GetMaximalPriorityWithoutLocking()+1);
- return pitl->GetImage();
- }
- }
+ {
+ ImageToLoadPtr pitl = const_cast<ImageToLoadPtr>(i->first);
+ // Already inserted
+ if (pitl->GetImage() != NULL)
+ {
+ // Already read
+ UpdateUnloadPriority( pitl, GetMaximalPriorityWithoutLocking()+1 );
+ return pitl->GetImage();
+ } // if pitl->GetImage()
+ } // if i
+
ImageToLoadPtr pitl = new ImageToLoad(this,filename,0);
- mImages[pitl] = 0;
- pitl->SetImage(mReader->Read(filename));
- UpdateUnloadPriority(pitl,
- GetMaximalPriorityWithoutLocking()+1);
+ mImages[pitl] = NULL;
+ pitl->SetImage( mReader->ReadImage(filename) );
+ UpdateUnloadPriority( pitl, GetMaximalPriorityWithoutLocking()+1 );
return pitl->GetImage();
- }
+ } // if true
+ /*
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);
//
-
+ */
+ printf("EED MultiThreadImageReader::GetImage END\n");
+
}
//=====================================================================
void MultiThreadImageReader::SignalImageRead(ImageToLoadPtr p,
bool purge)
{
- // std::cout << "MultiThreadImageReader::SignalImageRead" <<std::endl;
+
+// std::cout << "MultiThreadImageReader::SignalImageRead" <<std::endl;
// std::cout << "this="<<this <<std::endl;
// std::cout << "user="<<p->GetUser() <<std::endl;
if ( p->GetUser() == this )
+ {
GetMultiThreadImageReaderUserMutex().Unlock();
+ }
p->GetUser()->MultiThreadImageReaderSendEvent
(p->GetFilename(),
BUGGY : TO FIX
*/
if (!purge) return;
+ GimmickMessage(5,"Image '"<<p->GetFilename()<<"' read"<<std::endl);
// wxMutexLocker lock(GetMultiThreadImageReaderUserMutex());
mUnloadQueue.insert(p);
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
p->GetImage()->UpdateInformation();
p->GetImage()->PropagateUpdateExtent();
long ImMem = p->GetImage()->GetEstimatedMemorySize();
+#else
+ int ext[6];
+ int dim[3];
+ p->GetImage()->GetExtent(ext);
+ dim[0] = ext[1]-ext[0]+1;
+ dim[1] = ext[3]-ext[2]+1;
+ dim[2] = ext[5]-ext[4]+1;
+ long ImMem = dim[0]*dim[1]*dim[2]*p->GetImage()->GetScalarSize();;
+#endif
mTotalMem += ImMem;
- // std::cout << " ==> Total mem = "<<mTotalMem<<" Ko"<<std::endl;
+
+ GimmickMessage(5,"==> Image in memory = "<<mUnloadQueue.size()<<std::endl);
+ GimmickMessage(5,"==> Total mem = "<<mTotalMem<<" Ko"<<std::endl);
+
+ // return;
+
while (mTotalMem > mTotalMemMax)
{
- // std::cout
- // <<" ! Exceeded max of "
- // << mTotalMemMax << " : unloading oldest image ... "
- // << std::endl;
+ GimmickMessage(5,
+ " ! Exceeded max of "
+ << mTotalMemMax << " Ko : unloading oldest image ... "
+ << std::endl);
if ( mUnloadQueue.size() <= 1 )
{
- // std::cout << "Only one image : cannot load AND unload it !!"
- // <<std::endl;
+ GimmickMessage(5,
+ " Only one image : cannot load AND unload it !!"
+ <<std::endl);
break;
-
+
}
ImageToLoadPtr unload = mUnloadQueue.remove_top();
MultiThreadImageReaderUser* user = unload->GetUser();
+ /*
if ((user!=0)&&(user!=this))
{
user->GetMultiThreadImageReaderUserMutex().Lock();
}
+ */
+
+ std::string filename = unload->GetFilename();
+ GimmickMessage(5,"'" << filename << "'" << std::endl);
- // std::cout << "'" << unload->GetFilename() << "'" << std::endl;
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
mTotalMem -= unload->GetImage()->GetEstimatedMemorySize();
- // std::cout << " ==> Total mem = "<<mTotalMem<<" Ko "<<std::endl;
-
+#else
+ int ext[6];
+ int dim[3];
+ unload->GetImage()->GetExtent(ext);
+ dim[0] = ext[1]-ext[0]+1;
+ dim[1] = ext[3]-ext[2]+1;
+ dim[2] = ext[5]-ext[4]+1;
+ mTotalMem -= dim[0]*dim[1]*dim[2]*unload->GetImage()->GetScalarSize();
+#endif
+
+ GimmickMessage(5," ==> Total mem = "<<mTotalMem<<" Ko "<<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;
+ }
- std::string filename = unload->GetFilename();
if (unload->Index()>=0)
{
- // std::cout << "still in queue"<<std::endl;
+ // GimmickMessage(5,"still in queue"<<std::endl);
}
unload->Index() = -1;
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();
// std::cout << "### Thread "<<GetCurrentId()<<" : reading '"
// << i->GetFilename() << "' : DONE" << std::endl;
- }
- else
- {
+ } else {
mMultiThreadImageReader->MultiThreadImageReaderEventUnlock();
//mMutex.Unlock();
// Wait a little to avoid blocking
- Sleep(10);
+ wxMilliSleep(10);
}
};
// std::cout << "### Thread "<<GetCurrentId()<<" stopping"
//=====================================================================
vtkImageData* ThreadedImageReader::Read(const std::string& filename)
{
- return mReader.Read(filename);
+ return mReader.ReadImage(filename);
}
//=====================================================================
git://git.creatis.insa-lyon.fr / creaImageIO.git / blobdiff