nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Automatic deleting functors, only if necessary.

Browse source
This commit is contained in:
Benjamin Bouvier 2012-07-11 10:41:48 +02:00
commit 108c0bcf35
4 changed files with 60 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

25
eo/src/mpi/eoMpi.h
View file

@ -40,11 +40,19 @@ namespace eo
template< typename JobData, typename Wrapped > template< typename JobData, typename Wrapped >
struct SharedDataFunction struct SharedDataFunction
{ {
SharedDataFunction( Wrapped * w = 0 ) : _wrapped( w ) SharedDataFunction( Wrapped * w = 0 ) : _wrapped( w ), _needDelete( false )
{ {
// empty // empty
} }
virtual ~SharedDataFunction()
{
if( _wrapped && _wrapped->needDelete() )
{
delete _wrapped;
}
}
void wrapped( Wrapped * w ) void wrapped( Wrapped * w )
{ {
_wrapped = w; _wrapped = w;
@ -59,9 +67,13 @@ namespace eo
} }
} }
bool needDelete() { return _needDelete; }
void needDelete( bool b ) { _needDelete = b; }
protected: protected:
JobData* d; JobData* d;
Wrapped* _wrapped; Wrapped* _wrapped;
bool _needDelete;
}; };
template< typename JobData > template< typename JobData >
@ -119,7 +131,6 @@ namespace eo
template< typename JobData > template< typename JobData >
struct JobStore struct JobStore
{ {
// TODO commentaire: ces pointeurs devraient être alloués avec new pour éviter segfault on quit.
JobStore( JobStore(
SendTaskFunction<JobData>* stf, SendTaskFunction<JobData>* stf,
HandleResponseFunction<JobData>* hrf, HandleResponseFunction<JobData>* hrf,
@ -138,12 +149,10 @@ namespace eo
~JobStore() ~JobStore()
{ {
// TODO commentaire: Composition Pattern => délégation de la destruction => destruction homogène => new if( _stf->needDelete() ) delete _stf;
// et delete partout. if( _hrf->needDelete() ) delete _hrf;
delete _stf; if( _ptf->needDelete() ) delete _ptf;
delete _hrf; if( _iff->needDelete() ) delete _iff;
delete _ptf;
delete _iff;
} }
SendTaskFunction<JobData> & sendTask() { return *_stf; } SendTaskFunction<JobData> & sendTask() { return *_stf; }

2
eo/src/mpi/eoMultiParallelApply.h
View file

@ -27,7 +27,6 @@ namespace eo
~ProcessTaskParallelEval() ~ProcessTaskParallelEval()
{ {
delete _wrapped;
} }
}; };
@ -39,7 +38,6 @@ namespace eo
ParallelEvalStore( ParallelEvalStore(
eoUF<EOT&, void> & _proc, eoUF<EOT&, void> & _proc,
int _masterRank, int _masterRank,
// long _maxTime = 0,
int _packetSize = 1 int _packetSize = 1
) : ) :
ParallelApplyStore< EOT >( _proc, *( new std::vector<EOT> ), _masterRank, _packetSize ) ParallelApplyStore< EOT >( _proc, *( new std::vector<EOT> ), _masterRank, _packetSize )

49
eo/src/mpi/eoParallelApply.h
View file

@ -21,17 +21,23 @@ namespace eo
{ {
ParallelApplyData( ParallelApplyData(
eoUF<EOT&, void> & _proc, eoUF<EOT&, void> & _proc,
std::vector<EOT> & _pop,
int _masterRank, int _masterRank,
// long _maxTime = 0, // long _maxTime = 0,
int _packetSize int _packetSize,
std::vector<EOT> * _pop = 0
) : ) :
_data( &_pop ), func( _proc ), index( 0 ), size( _pop.size() ), packetSize( _packetSize ), masterRank( _masterRank ), comm( Node::comm() ) _data( _pop ), func( _proc ), index( 0 ), packetSize( _packetSize ), masterRank( _masterRank ), comm( Node::comm() )
{ {
if ( _packetSize <= 0 ) if ( _packetSize <= 0 )
{ {
throw std::runtime_error("Packet size should not be negative."); throw std::runtime_error("Packet size should not be negative.");
} }
if( _pop )
{
size = _pop->size();
}
tempArray = new EOT[ _packetSize ]; tempArray = new EOT[ _packetSize ];
} }
@ -172,18 +178,36 @@ namespace eo
ParallelApplyStore( ParallelApplyStore(
eoUF<EOT&, void> & _proc, eoUF<EOT&, void> & _proc,
std::vector<EOT>& _pop,
int _masterRank, int _masterRank,
// long _maxTime = 0,
int _packetSize = 1, int _packetSize = 1,
// JobStore functors // JobStore functors
SendTaskParallelApply<EOT> * stpa = new SendTaskParallelApply<EOT>, SendTaskParallelApply<EOT> * stpa = 0,
HandleResponseParallelApply<EOT>* hrpa = new HandleResponseParallelApply<EOT>, HandleResponseParallelApply<EOT>* hrpa = 0,
ProcessTaskParallelApply<EOT>* ptpa = new ProcessTaskParallelApply<EOT>, ProcessTaskParallelApply<EOT>* ptpa = 0,
IsFinishedParallelApply<EOT>* ifpa = new IsFinishedParallelApply<EOT> IsFinishedParallelApply<EOT>* ifpa = 0
) : ) :
_data( _proc, _pop, _masterRank, _packetSize ) _data( _proc, _masterRank, _packetSize )
{ {
if( stpa == 0 ) {
stpa = new SendTaskParallelApply<EOT>;
stpa->needDelete( true );
}
if( hrpa == 0 ) {
hrpa = new HandleResponseParallelApply<EOT>;
hrpa->needDelete( true );
}
if( ptpa == 0 ) {
ptpa = new ProcessTaskParallelApply<EOT>;
ptpa->needDelete( true );
}
if( ifpa == 0 ) {
ifpa = new IsFinishedParallelApply<EOT>;
ifpa->needDelete( true );
}
_stf = stpa; _stf = stpa;
_hrf = hrpa; _hrf = hrpa;
_ptf = ptpa; _ptf = ptpa;
@ -192,6 +216,11 @@ namespace eo
ParallelApplyData<EOT>* data() { return &_data; } ParallelApplyData<EOT>* data() { return &_data; }
void data( std::vector<EOT>& _pop )
{
_data.init( _pop );
}
virtual ~ParallelApplyStore() virtual ~ParallelApplyStore()
{ {
} }

4
eo/src/mpi/eoTerminateJob.h
View file

@ -49,9 +49,13 @@ namespace eo
DummyJobStore() DummyJobStore()
{ {
_stf = new DummySendTaskFunction; _stf = new DummySendTaskFunction;
_stf->needDelete( true );
_hrf = new DummyHandleResponseFunction; _hrf = new DummyHandleResponseFunction;
_hrf->needDelete( true );
_ptf = new DummyProcessTaskFunction; _ptf = new DummyProcessTaskFunction;
_ptf->needDelete( true );
_iff = new DummyIsFinishedFunction; _iff = new DummyIsFinishedFunction;
_iff->needDelete( true );
} }
void* data() { return 0; } void* data() { return 0; }