git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@794 331e1502-861f-0410-8da2-ba01fb791d7f

trunk/paradiseo-peo/src/core/communicable.cpp

@@ -93,5 +93,9 @@ void Communicable :: resume () {
   sem_post (& sem_stop);
 }
 
+void initCommunicableEnv () {
 
-
+  key_to_comm.resize (1);
+  comm_to_key.clear ();
+  Communicable :: num_comm = 0;
+}

trunk/paradiseo-peo/src/core/communicable.h

@@ -39,6 +39,7 @@
 
 #include <semaphore.h>
 
+
 typedef unsigned COMM_ID;
 
 class Communicable {
@@ -57,6 +58,10 @@ public :
   void stop (); /* It suspends the current process */
   void resume (); /* It resumes ___________ */
 
+public :
+
+  static unsigned num_comm;
+
 protected :
 
   COMM_ID key;
@@ -64,10 +69,10 @@ protected :
   sem_t sem_lock;
   
   sem_t sem_stop;
-
-  static unsigned num_comm;
 };
 
+extern void initCommunicableEnv ();
+
 extern Communicable * getCommunicable (COMM_ID __key); 
 
 //extern COMM_ID getKey (const Communicable * __comm);

trunk/paradiseo-peo/src/core/eoPop_mesg.h

@@ -41,6 +41,7 @@
 
 #include "messaging.h"
 
+
 template <class EOT> void pack (const eoPop <EOT> & __pop) {
 
   pack ((unsigned) __pop.size ());
@@ -57,4 +58,5 @@ template <class EOT> void unpack (eoPop <EOT> & __pop) {
   for (unsigned i = 0; i < n; i ++)
     unpack (__pop [i]);
 }
+
 #endif

trunk/paradiseo-peo/src/core/eoVector_mesg.h

@@ -41,6 +41,7 @@
 
 #include "messaging.h"
 
+
 template <class F, class T> void pack (const eoVector <F, T> & __v) {
 
   pack (__v.fitness ()) ;

trunk/paradiseo-peo/src/core/messaging.h

@@ -83,7 +83,6 @@ template <class U, class V> void pack (const std :: pair <U, V> & __pair) {
 }
 
 
-//
 
 /* Char */
 extern void unpack (char & __c); 

trunk/paradiseo-peo/src/core/peo_debug.cpp

@@ -78,18 +78,22 @@ void endDebugging () {
   for (unsigned i = 0; i < files.size (); i ++)
     if (files [i] != stdout)
       fclose (files [i]);
+  files.clear();
 }
 
 void printDebugMessage (const char * __mess) {
-  return;
+
   if (debug) {
 
     char buff [MAX_BUFF_SIZE];
+    char localTime [MAX_BUFF_SIZE];
     time_t t = time (0);
 
     /* Date */
-    sprintf (buff, "[%s][%s: ", host, ctime (& t));
+    strcpy( localTime, ctime (& t) ); 
-    * strchr (buff, '\n') = ']';
+    localTime[ strlen( localTime )-1 ] = ']';
+    sprintf (buff, "[%s][%s: ", host, localTime );
+
     for (unsigned i = 0; i < files.size (); i ++)
       fprintf (files [i], buff);
 

trunk/paradiseo-peo/src/core/peo_fin.cpp

@@ -39,7 +39,6 @@
 #include "runner.h"
 #include "rmc.h"
 
-
 void peo :: finalize () {
 
   printDebugMessage ("waiting for the termination of all threads");

trunk/paradiseo-peo/src/core/peo_init.cpp

@@ -41,6 +41,27 @@
 #include "peo_debug.h"
 #include "rmc.h"
 
+
+extern void initCommunicableEnv ();
+
+extern void initThreadsEnv ();
+extern void initReactiveThreadsEnv ();
+
+extern void initRunnersEnv ();
+extern void initWorkersEnv ();
+
+
+static void initExecutionEnv() {
+
+  initCommunicableEnv ();
+
+  initThreadsEnv ();
+  initReactiveThreadsEnv ();
+
+  initRunnersEnv ();
+  initWorkersEnv ();
+}
+
 namespace peo {
 
   int * argc;
@@ -53,6 +74,9 @@ namespace peo {
     
     argv = & __argv;
 
+    /* Initializing the execution environment */
+    initExecutionEnv();
+
     /* Initializing the the Resource Management and Communication */
     initRMC (__argc, __argv);
 

trunk/paradiseo-peo/src/core/reac_thread.cpp

@@ -56,9 +56,18 @@ void ReactiveThread :: wakeUp () {
   sem_post (& sem);	
 }
 
+void initReactiveThreadsEnv () {
+
+  the_end = false;
+  reac_threads.clear ();
+}
+
 void stopReactiveThreads () {
 
   the_end = true;
   for (unsigned i = 0; i < reac_threads.size (); i ++)
     reac_threads [i] -> wakeUp  ();
+  reac_threads.clear ();
 }
+
+bool theEnd () { return the_end; }

trunk/paradiseo-peo/src/core/reac_thread.h

@@ -41,6 +41,7 @@
 
 #include "thread.h"
 
+
 class ReactiveThread : public Thread {
 	
 public:
@@ -55,9 +56,12 @@ public:
 private:
 
   sem_t sem;
-   
 };
 
+extern void initReactiveThreadsEnv ();
+
 extern void stopReactiveThreads ();
 
-#endif /*THREAD_H_*/
+extern bool theEnd ();
+
+#endif /*REAC_THREAD_H_*/

trunk/paradiseo-peo/src/core/runner.cpp

@@ -44,6 +44,9 @@
 #include "../rmc/mpi/mess.h"
 #include "../rmc/mpi/tags.h"
 
+#include "../rmc/mpi/node.h"
+#include "../rmc/mpi/schema.h"
+
 
 static std :: vector <pthread_t *> ll_threads; /* Low-level runner threads */ 
 
@@ -63,8 +66,11 @@ extern int getNumberOfNodes ();
 
 Runner :: Runner () {
 
+  exec_id = 0;
   def_id = ++ num_def_runners;
+
   the_runners.push_back (this);
+
   sem_init (& sem_start, 0, 0);
   sem_init (& sem_cntxt, 0, 0);
 }
@@ -76,7 +82,12 @@ RUNNER_ID Runner :: getDefinitionID () {
 
 RUNNER_ID Runner :: getExecutionID () {
 
-  return def_id;
+  return exec_id;
+}
+
+void Runner :: setExecutionID (const RUNNER_ID& execution_id) {
+
+  exec_id = execution_id;
 }
 
 Runner * getRunner (RUNNER_ID __key) {
@@ -101,7 +112,6 @@ void unpackExecutionContext () {
 
 void initializeContext () {
 
-
   initMessage ();
   packExecutionContext ();
   sendMessageToAll (EXECUTION_CONTEXT_TAG);
@@ -121,6 +131,13 @@ void initializeContext () {
 
   cleanBuffers ();
 
+  // setting up the execution IDs
+  for (unsigned i = 0; i < the_runners.size (); i ++)
+    the_runners [i] -> setExecutionID ( my_node -> execution_id_run[ i ] );
+
+
+  // synchronizing - all the nodes have to finish initializing
+  // the context before actually executing the runners
   synchronizeNodes ();
 
   for (unsigned i = 0; i < the_runners.size (); i ++)
@@ -163,6 +180,7 @@ void startRunners () {
 void joinRunners () {
 
   joinThreads (ll_threads);
+  the_runners.clear();
 }
 
 bool atLeastOneActiveRunner () {
@@ -201,3 +219,13 @@ void unpackTerminationOfRunner () {
     stopReactiveThreads ();
   }
 }
+
+void initRunnersEnv () {
+
+  ll_threads.clear ();
+  the_runners.clear ();
+
+  num_def_runners = 0;
+  num_local_exec_runners = 0;
+  num_exec_runners = 0;
+}

trunk/paradiseo-peo/src/core/runner.h

@@ -56,6 +56,8 @@ public :
 
   RUNNER_ID getExecutionID ();
 
+  void setExecutionID (const RUNNER_ID& execution_id);
+
   bool isAssignedLocally ();
 
   void waitStarting ();
@@ -80,9 +82,12 @@ private :
   sem_t sem_cntxt;
 
   unsigned def_id;
+  unsigned exec_id;
 };
 
 
+extern void initRunnersEnv ();
+
 extern Runner * getRunner (RUNNER_ID __key); 
 
 extern void initializeContext ();
@@ -97,5 +102,4 @@ extern unsigned numberOfActiveRunners ();
 
 extern void unpackTerminationOfRunner ();
 
-
 #endif

trunk/paradiseo-peo/src/core/service.cpp

@@ -51,9 +51,8 @@ Service * getService (SERVICE_ID __key) {
   return dynamic_cast <Service *> (getCommunicable (__key));
 }
 
-void Service :: notifySendingData () {
+void Service :: notifySendingData () { }
 
-}
 void Service :: notifySendingResourceRequest () {
 
   num_sent_rr --;
@@ -61,26 +60,14 @@ void Service :: notifySendingResourceRequest () {
     notifySendingAllResourceRequests ();
 }
 
-void Service :: notifySendingAllResourceRequests () {
+void Service :: notifySendingAllResourceRequests () { }
 
-}
+void Service :: packData () {}
 
-void Service :: packData () {
+void Service :: unpackData () {}
 
-}
+void Service :: execute () {}
 
-void Service :: unpackData () {
+void Service :: packResult () {}
 
-}
+void Service :: unpackResult () {}
-
-void Service :: execute () {
-
-}
-  
-void Service :: packResult () {
-
-}
-
-void Service :: unpackResult () {
-
-}

trunk/paradiseo-peo/src/core/service.h

@@ -40,6 +40,7 @@
 #include "communicable.h"
 #include "thread.h"
 
+
 typedef unsigned SERVICE_ID;
 
 class Service : public Communicable {

trunk/paradiseo-peo/src/core/thread.cpp

@@ -73,6 +73,12 @@ void Thread :: setPassive () {
   } 
 }
 
+void initThreadsEnv () {
+
+  threads.clear ();
+  num_act = 0;
+}
+
 bool atLeastOneActiveThread () {
 
   return num_act;
@@ -95,6 +101,9 @@ void addThread (Thread * __hl_thread, std :: vector <pthread_t *> & __ll_threads
 
 void joinThreads (std :: vector <pthread_t *> & __threads) {
 
-  for (unsigned i = 0; i < __threads.size (); i ++)    
+  for (unsigned i = 0; i < __threads.size (); i ++) {
     pthread_join (* __threads [i], 0);
+    delete __threads [i];
+  }
+  __threads.clear();
 }

trunk/paradiseo-peo/src/core/thread.h

@@ -39,8 +39,8 @@
 
 #include <vector>
 
-/* A high-level thread */
 
+/* A high-level thread */
 class Thread {
 	
 public:
@@ -63,6 +63,8 @@ private :
   bool act;
 };
 
+extern void initThreadsEnv ();
+
 extern void addThread (Thread * __hl_thread, std :: vector <pthread_t *> & __ll_threads);
 
 extern void joinThreads (std :: vector <pthread_t *> & __ll_threads);

trunk/paradiseo-peo/src/peoParallelAlgorithmWrapper.h

@@ -57,6 +57,14 @@ class peoParallelAlgorithmWrapper : public Runner
     : algorithm( new Algorithm< AlgorithmType, AlgorithmDataType >( externalAlgorithm, externalData ) )
     {}
 
+  template< typename AlgorithmReturnType > peoParallelAlgorithmWrapper( AlgorithmReturnType& (*externalAlgorithm)() )
+    : algorithm( new FunctionAlgorithm< AlgorithmReturnType, void >( externalAlgorithm ) )
+    {}
+
+  template< typename AlgorithmReturnType, typename AlgorithmDataType > peoParallelAlgorithmWrapper( AlgorithmReturnType& (*externalAlgorithm)( AlgorithmDataType& ), AlgorithmDataType& externalData )
+    : algorithm( new FunctionAlgorithm< AlgorithmReturnType, AlgorithmDataType >( externalAlgorithm, externalData ) )
+    {}
+
   ~peoParallelAlgorithmWrapper()
     {
       
@@ -83,7 +91,6 @@ class peoParallelAlgorithmWrapper : public Runner
     { }
   };
   
-
   template< typename AlgorithmType, typename AlgorithmDataType > struct Algorithm : public AbstractAlgorithm
   {
 
@@ -100,7 +107,6 @@ class peoParallelAlgorithmWrapper : public Runner
     AlgorithmDataType& algorithmData;
   };
 
-
   template< typename AlgorithmType > struct Algorithm< AlgorithmType, void >  : public AbstractAlgorithm
   {
 
@@ -115,6 +121,36 @@ class peoParallelAlgorithmWrapper : public Runner
     AlgorithmType& algorithm;
   };
 
+  template< typename AlgorithmReturnType, typename AlgorithmDataType > struct FunctionAlgorithm : public AbstractAlgorithm
+  {
+
+  FunctionAlgorithm( AlgorithmReturnType (*externalAlgorithm)( AlgorithmDataType& ), AlgorithmDataType& externalData )
+    : algorithm( externalAlgorithm ), algorithmData( externalData )
+    {}
+    
+    virtual void operator()()
+    {
+      algorithm( algorithmData );
+    }
+
+    AlgorithmReturnType (*algorithm)( AlgorithmDataType& );
+    AlgorithmDataType& algorithmData;
+  };
+  
+  template< typename AlgorithmReturnType > struct FunctionAlgorithm< AlgorithmReturnType, void > : public AbstractAlgorithm
+  {
+
+  FunctionAlgorithm( AlgorithmReturnType (*externalAlgorithm)() )
+    : algorithm( externalAlgorithm )
+    {}
+    
+    virtual void operator()()
+    {
+      algorithm();
+    }
+    
+    AlgorithmReturnType (*algorithm)();
+  };
   
  private:
 

trunk/paradiseo-peo/src/peoSyncIslandMig.h

@@ -230,8 +230,8 @@ template< class EOT > void peoSyncIslandMig< EOT > :: pack()
 
   lock ();
 
-  pack( coop_em.front()->getKey() );
+  ::pack( coop_em.front()->getKey() );
-  pack( em.front() );
+  ::pack( em.front() );
   coop_em.pop();
   em.pop();
 
@@ -245,7 +245,7 @@ template< class EOT > void peoSyncIslandMig< EOT > :: unpack()
   lock ();
 
   eoPop< EOT > mig;
-  unpack( mig );
+  ::unpack( mig );
   imm.push( mig );
 
   unlock();

trunk/paradiseo-peo/src/peoSynchronousMultiStart.h

@@ -56,18 +56,40 @@ template < typename EntityType > class peoSynchronousMultiStart : public Service
     aggregationFunction = new NoAggregationFunction();
   }
 
+  template < typename AlgorithmReturnType, typename AlgorithmDataType > peoSynchronousMultiStart( AlgorithmReturnType (*externalAlgorithm)( AlgorithmDataType& ) )
+  {
+
+    singularAlgorithm = new FunctionAlgorithm< AlgorithmReturnType, AlgorithmDataType >( externalAlgorithm );
+    algorithms.push_back( singularAlgorithm );
+
+    aggregationFunction = new NoAggregationFunction();
+  }
+
   template < typename AlgorithmType, typename AggregationFunctionType > peoSynchronousMultiStart( std::vector< AlgorithmType* >& externalAlgorithms, AggregationFunctionType& externalAggregationFunction )
   {
 
-      for ( unsigned int index = 0; index < externalAlgorithms; index++ )
+    for ( unsigned int index = 0; index < externalAlgorithms.size(); index++ )
       {
 
 	algorithms.push_back( new Algorithm< AlgorithmType >( *externalAlgorithms[ index ] ) );
       }
 
-      aggregationFunction = new Algorithm< AggregationFunctionType >( externalAggregationFunction );
+    aggregationFunction = new AggregationAlgorithm< AggregationFunctionType >( externalAggregationFunction );
   }
 
+  template < typename AlgorithmReturnType, typename AlgorithmDataType, typename AggregationFunctionType > 
+    peoSynchronousMultiStart( std::vector< AlgorithmReturnType (*)( AlgorithmDataType& ) >& externalAlgorithms, 
+			      AggregationFunctionType& externalAggregationFunction )
+  {
+
+    for ( unsigned int index = 0; index < externalAlgorithms.size(); index++ )
+      {
+
+	algorithms.push_back( new FunctionAlgorithm< AlgorithmReturnType, AlgorithmDataType >( externalAlgorithms[ index ] ) );
+      }
+
+    aggregationFunction = new AggregationAlgorithm< AggregationFunctionType >( externalAggregationFunction );
+  }
 
   ~peoSynchronousMultiStart()
   {
@@ -175,6 +197,19 @@ template < typename EntityType > class peoSynchronousMultiStart : public Service
   };
 
 
+  template < typename AlgorithmReturnType, typename AlgorithmDataType > struct FunctionAlgorithm : public AbstractAlgorithm
+  {
+
+    FunctionAlgorithm( AlgorithmReturnType (*externalAlgorithm)( AlgorithmDataType& ) ) : algorithm( externalAlgorithm )
+      { }
+
+    void operator()( AbstractDataType& dataTypeInstance )
+    {
+      algorithm( dataTypeInstance );
+    }
+
+    AlgorithmReturnType (*algorithm)( AlgorithmDataType& );
+  };
 
   struct AbstractAggregationAlgorithm
   {

trunk/paradiseo-peo/src/rmc/mpi/comm.cpp

@@ -56,6 +56,7 @@ Communicator :: Communicator (int * __argc, char * * * __argv) {
   the_thread = this;  
   initNode  (__argc, __argv);
   loadRMCParameters (* __argc, * __argv);
+
   sem_post (& sem_comm_init);
 }
 
@@ -68,15 +69,18 @@ void Communicator :: start () {
 
     sendMessages ();
 
-    if (! atLeastOneActiveRunner ())     
+    if (theEnd() || ! atLeastOneActiveRunner ())     
       break;
 
     receiveMessages ();
   }
 
   waitBuffers ();
+  sem_destroy(& sem_comm_init);
+
   printDebugMessage ("finalizing");
-  MPI_Finalize ();  
+
+  synchronizeNodes ();
 }
 
 void initCommunication () {

trunk/paradiseo-peo/src/rmc/mpi/mess.h

@@ -58,4 +58,3 @@ extern void waitMessage ();
 extern void synchronizeNodes ();
 
 #endif
-

trunk/paradiseo-peo/src/rmc/mpi/node.cpp

@@ -40,6 +40,52 @@
 #include <string>
 #include <cassert>
 
+
+class MPIThreadedEnv {
+
+public:
+
+  static void init ( int * __argc, char * * * __argv ) {
+
+    static MPIThreadedEnv mpiThreadedEnv( __argc, __argv );
+  }
+
+  static void finalize () {
+
+    static bool finalizedEnvironment = false;
+
+    if (! finalizedEnvironment ) {
+
+      MPI_Finalize ();
+      finalizedEnvironment = true;
+    }
+  }
+
+private:
+
+  /* No instance of this class can be created outside its domain */
+  MPIThreadedEnv ( int * __argc, char * * * __argv ) {
+
+    static bool MPIThreadedEnvInitialized = false;
+    int provided = 1;
+
+    if (! MPIThreadedEnvInitialized) {
+
+      MPI_Init_thread (__argc, __argv, MPI_THREAD_FUNNELED, & provided);  
+      assert (provided == MPI_THREAD_FUNNELED); /* The MPI implementation must be multi-threaded.
+					       Yet, only one thread performs the comm.
+					       operations */
+      MPIThreadedEnvInitialized = true;
+    }
+  }
+
+  ~MPIThreadedEnv() {
+
+    finalize ();
+  }
+};
+
+
 static int rk, sz; /* Rank & size */
 
 static std :: map <std :: string, int> name_to_rk;
@@ -63,11 +109,13 @@ int getRankFromName (const std :: string & __name) {
 
 void initNode (int * __argc, char * * * __argv) {
 
-  int provided;
+  rk_to_name.clear ();
-  MPI_Init_thread (__argc,  __argv, MPI_THREAD_FUNNELED, & provided);  
+  name_to_rk.clear ();
-  assert (provided == MPI_THREAD_FUNNELED); /* The MPI implementation must be multi-threaded.
+
-					       Yet, only one thread performs the comm.
+
-					       operations */
+  MPIThreadedEnv :: init ( __argc, __argv );
+
+
   MPI_Comm_rank (MPI_COMM_WORLD, & rk);   /* Who ? */
   MPI_Comm_size (MPI_COMM_WORLD, & sz);    /* How many ? */
 
@@ -83,4 +131,3 @@ void initNode (int * __argc, char * * * __argv) {
     name_to_rk [names [i]] = i;
   }
 }
-

trunk/paradiseo-peo/src/rmc/mpi/rmc.cpp

@@ -42,12 +42,16 @@
 #include "../../core/peo_debug.h"
 
 static std :: vector <pthread_t *> ll_threads; /* Low level threads */
+static std :: vector <Worker *> worker_threads; /* Worker threads */
+static Communicator* communicator_thread = NULL; /* Communicator thread */
 
 void runRMC () {
 
   /* Worker(s) ? */
-  for (unsigned i = 0; i < my_node -> num_workers; i ++) 
+  for (unsigned i = 0; i < my_node -> num_workers; i ++) {
-    addThread (new Worker, ll_threads);
+    worker_threads.push_back (new Worker);
+    addThread (worker_threads.back(), ll_threads);
+  }
 
   wakeUpCommunicator ();
 }
@@ -56,20 +60,26 @@ void initRMC (int & __argc, char * * & __argv) {
 
   /* Communication */
   initCommunication ();
-  addThread (new Communicator (& __argc, & __argv), ll_threads);
+  communicator_thread = new Communicator (& __argc, & __argv);
+  addThread (communicator_thread, ll_threads);
   waitNodeInitialization ();
   initSending ();
 
   /* Scheduler */
   if (isScheduleNode ())
     initScheduler ();
-
-  ///
 }
 
 void finalizeRMC () {
 
   printDebugMessage ("before join threads RMC");
+
   joinThreads (ll_threads);
+  for (unsigned i = 0; i < worker_threads.size(); i++ ) {
+    delete worker_threads [i];
+  }
+  worker_threads.clear ();
+  delete communicator_thread;
+
   printDebugMessage ("after join threads RMC");
 }

trunk/paradiseo-peo/src/rmc/mpi/scheduler.cpp

@@ -49,6 +49,10 @@ static unsigned initNumberOfRes = 0;
 
 void initScheduler () {
 
+  resources = std :: queue <SCHED_RESOURCE> ();
+  requests = std :: queue <SCHED_REQUEST> ();
+  initNumberOfRes = 0;
+
   for (unsigned i = 0; i < the_schema.size (); i ++) {
 
     const Node & node = the_schema [i];

trunk/paradiseo-peo/src/rmc/mpi/schema.cpp

@@ -34,9 +34,8 @@
 *
 */
 
-#include <iostream>
 #include <set>
-#include <assert.h>
+#include <cassert>
 
 #include "schema.h"
 #include "xml_parser.h"
@@ -131,9 +130,9 @@ void loadSchema (const char * __filename) {
   name = getNextNode ();
   assert (name == "schema");
 
+  the_schema.clear();
   maxSpecifiedRunnerID = 0;
 
-
   while (true) {
 
     /* TAG: <group> | </schema> */

trunk/paradiseo-peo/src/rmc/mpi/schema.h

@@ -43,6 +43,7 @@
 
 #include "../../core/runner.h"
 
+
 typedef int RANK_ID;
 
 struct Node {

trunk/paradiseo-peo/src/rmc/mpi/send.cpp

@@ -61,9 +61,24 @@ static std :: queue <SEND_REQUEST> mess;
 
 static sem_t sem_send;
 
+static bool contextInitialized = false;
+
 void initSending () {
 
+  static bool initializedSem = false;
+
+  mess = std :: queue <SEND_REQUEST> ();
+
+  if (! initializedSem) {
     sem_init (& sem_send, 0, 1);
+    initializedSem = true;
+  }
+  else {
+    sem_destroy(& sem_send);
+    sem_init (& sem_send, 0, 1);
+  }
+
+  contextInitialized = false;
 }
 
 void send (Communicable * __comm, int __to, int __tag) {
@@ -90,8 +105,6 @@ void sendMessages () {
 
   sem_wait (& sem_send);
 
-  static bool contextInitialized = false;
-
   if (! contextInitialized) {
     contextInitialized = true;
     initializeContext();

trunk/paradiseo-peo/src/rmc/mpi/service.cpp

@@ -53,6 +53,6 @@ void Service :: packResourceRequest () {
   SCHED_REQUEST req;
   req.first = getNodeRank ();
   req.second = getKey ();
-  //  printf ("demande de ressource pour %d\n", req.second);
+
   :: pack (req);
 }

trunk/paradiseo-peo/src/rmc/mpi/tags.h

@@ -37,18 +37,17 @@
 #ifndef __tags_h
 #define __tags_h
 
-#define EXECUTION_CONTEXT_TAG 1000
-
 #define RUNNER_STOP_TAG 13
 
 #define COOP_TAG 14
 
 #define SCHED_REQUEST_TAG 16
-
 #define SCHED_RESULT_TAG 17
-#define TASK_DATA_TAG 18
 
+#define TASK_DATA_TAG 18
 #define TASK_RESULT_TAG 19
 #define TASK_DONE_TAG 20
 
+#define EXECUTION_CONTEXT_TAG 1000
+
 #endif

trunk/paradiseo-peo/src/rmc/mpi/worker.cpp

@@ -53,7 +53,7 @@ Worker * getWorker (WORKER_ID __key) {
 
 Worker :: Worker () {
   
-  toto = false;
+  recvAndCompleted = false;
   id = key_to_worker.size ();
   key_to_worker.push_back (this);
 }
@@ -84,7 +84,7 @@ void Worker :: packTaskDone () {
 void Worker :: notifySendingResult () {
 
   /* Notifying the scheduler of the termination */
-  toto = true;
+  recvAndCompleted = true;
   wakeUp ();
 }
 
@@ -107,9 +107,9 @@ void Worker :: start () {
     if (! atLeastOneActiveRunner ())
       break;
 
-    if (toto) {
+    if (recvAndCompleted) {
       send (this, my_node -> rk_sched, TASK_DONE_TAG);  
-      toto = false;
+      recvAndCompleted = false;
     }
     else {
 
@@ -119,3 +119,8 @@ void Worker :: start () {
     }
   }
 }
+
+void initWorkersEnv () {
+
+  key_to_worker.resize (1);
+}

trunk/paradiseo-peo/src/rmc/mpi/worker.h

@@ -41,6 +41,7 @@
 #include "../../core/reac_thread.h"
 #include "../../core/service.h"
 
+
 typedef unsigned WORKER_ID; 
 
 class Worker : public Communicable, public ReactiveThread {
@@ -70,9 +71,11 @@ private :
   Service * serv;
   int src;
 
-  bool toto;
+  bool recvAndCompleted;
 };
 
+extern void initWorkersEnv ();
+
 extern Worker * getWorker (WORKER_ID __key);
 
 #endif

trunk/paradiseo-peo/src/rmc/mpi/xml_parser.cpp

@@ -83,7 +83,6 @@ std :: string getNextNode () {
     xmlTextReaderRead (reader);
     name = xmlTextReaderName (reader);
     value = xmlTextReaderValue (reader);
-    //    printf ("value = %s\n", value);
   } while (! strcmp ((char *) name, "#text") && isSep (value));
 
   std :: string str;