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

diff --combined src/smpi/smpi_global.cpp
index 6fa71ac,76cd8d7..7f6c52c
--- 1/src/smpi/smpi_global.cpp
--- 2/src/smpi/smpi_global.cpp
+++ b/src/smpi/smpi_global.cpp
@@@ -376,12 -376,12 +376,12 @@@ void smpi_comm_null_copy_buffer_callbac
  static void smpi_check_options(){
    //check correctness of MPI parameters
  
 -   xbt_assert(xbt_cfg_get_int("smpi/async_small_thresh") <= xbt_cfg_get_int("smpi/send_is_detached_thresh"));
 +   xbt_assert(xbt_cfg_get_int("smpi/async-small-thresh") <= xbt_cfg_get_int("smpi/send-is-detached-thresh"));
  
 -   if (xbt_cfg_is_default_value("smpi/running_power")) {
 +   if (xbt_cfg_is_default_value("smpi/running-power")) {
       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."
 +              "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.");
     }
  }
@@@ -466,8 -466,12 +466,12 @@@ void smpi_global_destroy(void
    xbt_free(process_data);
    process_data = NULL;
  
-   if (MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED)
+   if (MPI_COMM_WORLD != MPI_COMM_UNINITIALIZED){
+     smpi_comm_cleanup_smp(MPI_COMM_WORLD);
+     smpi_comm_cleanup_attributes(MPI_COMM_WORLD);
      xbt_free(MPI_COMM_WORLD);
+   }
+ 
    MPI_COMM_WORLD = MPI_COMM_NULL;
  
    xbt_free(index_to_process_data);
@@@ -573,9 -577,9 +577,9 @@@ static void smpi_init_options()
      int barrier_id = find_coll_description(mpi_coll_barrier_description, xbt_cfg_get_string("smpi/barrier"),"barrier");
      mpi_coll_barrier_fun = (int (*)(MPI_Comm comm)) mpi_coll_barrier_description[barrier_id].coll;
  
 -    smpi_cpu_threshold = xbt_cfg_get_double("smpi/cpu_threshold");
 -    smpi_running_power = xbt_cfg_get_double("smpi/running_power");
 -    smpi_privatize_global_variables = xbt_cfg_get_boolean("smpi/privatize_global_variables");
 +    smpi_cpu_threshold = xbt_cfg_get_double("smpi/cpu-threshold");
 +    smpi_running_power = xbt_cfg_get_double("smpi/running-power");
 +    smpi_privatize_global_variables = xbt_cfg_get_boolean("smpi/privatize-global-variables");
      if (smpi_cpu_threshold < 0)
        smpi_cpu_threshold = DBL_MAX;
  }
@@@ -626,7 -630,7 +630,7 @@@ int smpi_main(int (*realmain) (int argc
      SIMIX_run();
  
      xbt_os_walltimer_stop(global_timer);
 -    if (xbt_cfg_get_boolean("smpi/display_timing")){
 +    if (xbt_cfg_get_boolean("smpi/display-timing")){
        double global_time = xbt_os_timer_elapsed(global_timer);
        XBT_INFO("Simulated time: %g seconds. \n\n"
            "The simulation took %g seconds (after parsing and platform setup)\n"