Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/smpi/smpi_global.c b/src/smpi/smpi_global.c
index 12da83c..dda28d9 100644 (file)
--- a/src/smpi/smpi_global.c
+++ b/src/smpi/smpi_global.c
@@ -130,10 +130,14 @@ void smpi_process_destroy(void)
  */
 void smpi_process_finalize(void)
 {
+    // This leads to an explosion of the search graph
+    // which cannot be reduced:
+    if(MC_is_active())
+      return;
+
     int index = smpi_process_index();
     // wait for all pending asynchronous comms to finish
     xbt_barrier_wait(process_data[index_to_process_data[index]]->finalization_barrier);
-
 }
 
 /**
@@ -215,6 +219,11 @@ int smpi_process_index(void)
   return data ? data->index : MPI_UNDEFINED;
 }
 
+int smpi_process_index_of_smx_process(smx_process_t process) {
+  smpi_process_data_t data = SIMIX_process_get_data(process);
+  return data ? data->index : MPI_UNDEFINED;
+}
+
 MPI_Comm smpi_process_comm_world(void)
 {
   smpi_process_data_t data = smpi_process_data();
@@ -350,7 +359,7 @@ static void smpi_check_options(){
      XBT_INFO("You did not set the power of the host running the simulation.  "
               "The timings will certainly not be accurate.  "
               "Use the option \"--cfg=smpi/running_power:<flops>\" to set its value."
-              "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information. ");
+              "Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.");
    }
 }