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

Solved memory leak on terminate job ctor

Browse source
This commit is contained in:
Benjamin Bouvier 2012-07-18 14:02:39 +02:00
commit 766a8f40d6
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -539,7 +539,7 @@ namespace eo
* AssignmentAlgorithm for more details.
*
* @param _masterRank The MPI rank of the master.
*
*
* @param _workerStopCondition Number of the message which will cause the workers to terminate. It could
* be one of the constants defined in eo::mpi::Commands, or any other integer. The user has to be sure
* that a message containing this integer will be sent to each worker on the Commands channel, otherwise
@ -552,24 +552,25 @@ namespace eo
Job( AssignmentAlgorithm& _algo,
int _masterRank,
int _workerStopCondition,
JobStore<JobData> & store
JobStore<JobData> & _store
) :
assignmentAlgo( _algo ),
masterRank( _masterRank ),
workerStopCondition( _workerStopCondition ),
comm( Node::comm() ),
// Functors
sendTask( store.sendTask() ),
handleResponse( store.handleResponse() ),
processTask( store.processTask() ),
isFinished( store.isFinished() )
store( _store ),
sendTask( _store.sendTask() ),
handleResponse( _store.handleResponse() ),
processTask( _store.processTask() ),
isFinished( _store.isFinished() )
{
_isMaster = Node::comm().rank() == _masterRank;
sendTask.data( store.data() );
handleResponse.data( store.data() );
processTask.data( store.data() );
isFinished.data( store.data() );
sendTask.data( _store.data() );
handleResponse.data( _store.data() );
processTask.data( _store.data() );
isFinished.data( _store.data() );
}
protected:
@ -764,6 +765,7 @@ namespace eo
const int workerStopCondition;
bmpi::communicator& comm;
JobStore<JobData>& store;
SendTaskFunction<JobData> & sendTask;
HandleResponseFunction<JobData> & handleResponse;
ProcessTaskFunction<JobData> & processTask;

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

@ -115,7 +115,7 @@ namespace eo
*/
EmptyJob( AssignmentAlgorithm& algo, int masterRank ) :
OneShotJob<void>( algo, masterRank, *(new DummyJobStore) )
// FIXME memory leak, meaningless but present
// the job store is deleted on destructor
{
// empty
}
@ -127,6 +127,7 @@ namespace eo
{
comm.send( idles[i], Channel::Commands, Message::Kill );
}
delete & this->store;
}
};