SMPI replay: make sure that the replay is inited even if rank 0 is not first for...

[simgrid.git] / src / smpi / smpi_replay.c

diff --git a/src/smpi/smpi_replay.c b/src/smpi/smpi_replay.c
index f329a8c..59c1601 100644 (file)
--- a/src/smpi/smpi_replay.c
+++ b/src/smpi/smpi_replay.c
@@ -167,7 +167,6 @@ const char* encode_datatype(MPI_Datatype datatype, int* known)
 
 static void action_init(const char *const *action)
 {
-  int i;
   XBT_DEBUG("Initialize the counters");
   CHECK_ACTION_PARAMS(action, 0, 1);
   if(action[2]) MPI_DEFAULT_TYPE= MPI_DOUBLE; // default MPE dataype 
@@ -1047,8 +1046,7 @@ void smpi_replay_init(int *argc, char***argv){
   TRACE_smpi_collective_in(rank, -1, __FUNCTION__, extra);
   TRACE_smpi_collective_out(rank, -1, __FUNCTION__);
 
-  if (!action_funs){
-    _xbt_replay_action_init();
+  if (!_xbt_replay_action_init()) {
     xbt_replay_action_register("init",       action_init);
     xbt_replay_action_register("finalize",   action_finalize);
     xbt_replay_action_register("comm_size",  action_comm_size);
@@ -1085,7 +1083,7 @@ void smpi_replay_init(int *argc, char***argv){
     smpi_execute_flops(value);
   } else {
     //UGLY done to force context switch to be sure that all MSG_processes begin initialization
-    XBT_VERB("Force context switch by smpi_execute_flops  - Sleeping for 0.0 flops ");
+    XBT_DEBUG("Force context switch by smpi_execute_flops  - Sleeping for 0.0 flops ");
     smpi_execute_flops(0.0);
   }