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

Suppressed some warnings at compilation.

Browse source
This commit is contained in:
Benjamin Bouvier 2012-07-10 16:08:35 +02:00
commit 6600f1db51
2 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
eo/src/eoPopEvalFunc.h
View file

@ -107,8 +107,8 @@ class eoParallelPopLoopEval : public eoPopEvalFunc<EOT>
) : ) :
assignAlgo( _assignAlgo ), assignAlgo( _assignAlgo ),
masterRank( _masterRank ), masterRank( _masterRank ),
needToDeleteStore( false ), store( _store ),
store( _store ) needToDeleteStore( false )
{ {
// empty // empty
} }

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

@ -197,10 +197,13 @@ namespace eo
class Job class Job
{ {
public: public:
Job( AssignmentAlgorithm& _algo, int _masterRank, JobStore<JobData> & store ) : Job( AssignmentAlgorithm& _algo,
int _masterRank,
JobStore<JobData> & store
) :
assignmentAlgo( _algo ), assignmentAlgo( _algo ),
comm( Node::comm() ),
masterRank( _masterRank ), masterRank( _masterRank ),
comm( Node::comm() ),
// Functors // Functors
sendTask( store.sendTask() ), sendTask( store.sendTask() ),
handleResponse( store.handleResponse() ), handleResponse( store.handleResponse() ),
@ -217,11 +220,6 @@ namespace eo
protected: protected:
SendTaskFunction<JobData> & sendTask;
HandleResponseFunction<JobData> & handleResponse;
ProcessTaskFunction<JobData> & processTask;
IsFinishedFunction<JobData> & isFinished;
struct FinallyBlock struct FinallyBlock
{ {
FinallyBlock( FinallyBlock(
@ -231,8 +229,9 @@ namespace eo
) : ) :
totalWorkers( _totalWorkers ), totalWorkers( _totalWorkers ),
assignmentAlgo( _algo ), assignmentAlgo( _algo ),
comm( Node::comm() ), that( _that ),
that( _that ) // global field
comm( Node::comm() )
{ {
// empty // empty
} }
@ -274,9 +273,10 @@ namespace eo
protected: protected:
int totalWorkers; int totalWorkers;
bmpi::communicator & comm;
Job< JobData > & that;
AssignmentAlgorithm& assignmentAlgo; AssignmentAlgorithm& assignmentAlgo;
Job< JobData > & that;
bmpi::communicator & comm;
}; };
void master( ) void master( )
@ -372,13 +372,17 @@ namespace eo
} }
protected: protected:
AssignmentAlgorithm& assignmentAlgo;
bmpi::communicator& comm;
int masterRank;
bool _isMaster;
struct rusage _usage; AssignmentAlgorithm& assignmentAlgo;
long _current; int masterRank;
bmpi::communicator& comm;
SendTaskFunction<JobData> & sendTask;
HandleResponseFunction<JobData> & handleResponse;
ProcessTaskFunction<JobData> & processTask;
IsFinishedFunction<JobData> & isFinished;
bool _isMaster;
}; };
} }
} }