welcome simgrid::smpi::Request

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

diff --git a/src/smpi/smpi_global.cpp b/src/smpi/smpi_global.cpp
index 924e89b011e9d771f3311744d2a0f8159b12c899..f67ffe0b869e984db749a6dbf9db838d8b0a5f01 100644 (file)
--- a/src/smpi/smpi_global.cpp
+++ b/src/smpi/smpi_global.cpp
@@ -352,8 +352,8 @@ MPI_Comm smpi_process_comm_self()
 {
   smpi_process_data_t data = smpi_process_data();
   if(data->comm_self==MPI_COMM_NULL){
-    MPI_Group group = new simgrid::SMPI::Group(1);
-    data->comm_self = new simgrid::SMPI::Comm(group, nullptr);
+    MPI_Group group = new simgrid::smpi::Group(1);
+    data->comm_self = new simgrid::smpi::Comm(group, nullptr);
     group->set_mapping(smpi_process_index(), 0);
   }
 
@@ -384,12 +384,6 @@ int smpi_process_get_sampling()
   return data->sampling;
 }
 
-void print_request(const char *message, MPI_Request request)
-{
-  XBT_VERB("%s  request %p  [buf = %p, size = %zu, src = %d, dst = %d, tag = %d, flags = %x]",
-       message, request, request->buf, request->size, request->src, request->dst, request->tag, request->flags);
-}
-
 void smpi_comm_set_copy_data_callback(void (*callback) (smx_activity_t, void*, size_t))
 {
   smpi_comm_copy_data_callback = callback;
@@ -604,8 +598,8 @@ void smpi_global_init()
   //if the process was launched through smpirun script we generate a global mpi_comm_world
   //if not, we let MPI_COMM_NULL, and the comm world will be private to each mpi instance
   if(smpirun){
-    group = new simgrid::SMPI::Group(process_count);
-    MPI_COMM_WORLD = new simgrid::SMPI::Comm(group, nullptr);
+    group = new simgrid::smpi::Group(process_count);
+    MPI_COMM_WORLD = new simgrid::smpi::Comm(group, nullptr);
     MPI_Attr_put(MPI_COMM_WORLD, MPI_UNIVERSE_SIZE, reinterpret_cast<void *>(process_count));
     msg_bar_t bar = MSG_barrier_init(process_count);
 
@@ -646,7 +640,7 @@ void smpi_global_destroy()
     MPI_COMM_WORLD->cleanup_attributes();
     if(smpi_coll_cleanup_callback!=nullptr)
       smpi_coll_cleanup_callback();
-    xbt_free(MPI_COMM_WORLD);
+    delete MPI_COMM_WORLD;
   }
 
   MPI_COMM_WORLD = MPI_COMM_NULL;