fix a new/free mismatch

[simgrid.git] / src / smpi / smpi_deployment.cpp

diff --git a/src/smpi/smpi_deployment.cpp b/src/smpi/smpi_deployment.cpp
index fc75d75..bfb684b 100644 (file)
--- a/src/smpi/smpi_deployment.cpp
+++ b/src/smpi/smpi_deployment.cpp
@@ -9,7 +9,6 @@
 #include "xbt/dict.h"
 #include "xbt/log.h"
 #include "xbt/sysdep.h"
-#include <src/smpi/smpi_group.hpp>
 
 static xbt_dict_t smpi_instances = nullptr;
 extern int process_count;
@@ -70,12 +69,12 @@ void smpi_deployment_register_process(const char* instance_id, int rank, int ind
   xbt_assert(instance, "Error, unknown instance %s", instance_id);
 
   if(instance->comm_world == MPI_COMM_NULL){
-    MPI_Group group = new simgrid::SMPI::Group(instance->size);
-    instance->comm_world = smpi_comm_new(group, nullptr);
+    MPI_Group group = new simgrid::smpi::Group(instance->size);
+    instance->comm_world = new simgrid::smpi::Comm(group, nullptr);
   }
   instance->present_processes++;
   index_to_process_data[index]=instance->index+rank;
-  smpi_comm_group(instance->comm_world)->set_mapping(index, rank);
+  instance->comm_world->group()->set_mapping(index, rank);
   *bar = instance->finalization_barrier;
   *comm = &instance->comm_world;
 }
@@ -86,8 +85,8 @@ void smpi_deployment_cleanup_instances(){
   char *name = nullptr;
   xbt_dict_foreach(smpi_instances, cursor, name, instance) {
     if(instance->comm_world!=MPI_COMM_NULL)
-      while (smpi_comm_group(instance->comm_world)->unuse() > 0);
-    xbt_free(instance->comm_world);
+      while (instance->comm_world->group()->unuse() > 0);
+    delete instance->comm_world;
     MSG_barrier_destroy(instance->finalization_barrier);
   }
   xbt_dict_free(&smpi_instances);