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

Added store management to eoPopEvalFunc.

Browse source
This commit is contained in:
Benjamin Bouvier 2012-07-04 10:53:57 +02:00
commit 603268b053
5 changed files with 148 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,6 +24,11 @@ namespace eo
d->comm.recv( d->masterRank, Channel::Commands, order );
}
}
~ProcessTaskParallelEval()
{
delete _wrapped;
}
};
template< class EOT >
@ -33,15 +38,20 @@ namespace eo
ParallelEvalStore(
eoUF<EOT&, void> & _proc,
std::vector<EOT>& _pop,
int _masterRank,
// long _maxTime = 0,
int _packetSize = 1
) :
ParallelApplyStore< EOT >( _proc, _pop, _masterRank, _packetSize )
ParallelApplyStore< EOT >( _proc, *( new std::vector<EOT> ), _masterRank, _packetSize )
// FIXME memory leak because of vector ==> use const correctness
{
wrapProcessTask( new ProcessTaskParallelEval<EOT> );
}
void data( std::vector<EOT>& _pop )
{
ParallelApplyStore<EOT>::_data.init( _pop );
}
};
}
}

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

@ -21,7 +21,7 @@ namespace eo
{
ParallelApplyData(
eoUF<EOT&, void> & _proc,
std::vector<EOT>& _pop,
std::vector<EOT> & _pop,
int _masterRank,
// long _maxTime = 0,
int _packetSize
@ -35,6 +35,14 @@ namespace eo
tempArray = new EOT[ _packetSize ];
}
void init( std::vector<EOT>& _pop )
{
index = 0;
size = _pop.size();
data = _pop;
assignedTasks.clear();
}
~ParallelApplyData()
{
delete [] tempArray;
@ -180,7 +188,7 @@ namespace eo
ParallelApplyData<EOT>* data() { return &_data; }
~ParallelApplyStore()
virtual ~ParallelApplyStore()
{
delete _stf;
delete _hrf;