Merge branch 'pikachuyann/simgrid-stoprofiles'

[simgrid.git] / src / smpi / mpi / smpi_comm.cpp

diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp
index d3e4978d1e896a9d0cc32f328f392c8be7c47e89..dcd7d834e70f62e76315ccc08b8611ccc153c0af 100644 (file)
--- a/src/smpi/mpi/smpi_comm.cpp
+++ b/src/smpi/mpi/smpi_comm.cpp
@@ -61,7 +61,7 @@ int Comm::dup(MPI_Comm* newcomm){
     // we need to switch as the called function may silently touch global variables
     smpi_switch_data_segment(s4u::Actor::self());
   }
-  MPI_Group cp = new  Group(this->group());
+  auto* cp     = new Group(this->group());
   (*newcomm)   = new  Comm(cp, this->topo());
   int ret      = MPI_SUCCESS;
 
@@ -262,12 +262,12 @@ MPI_Comm Comm::split(int color, int key)
         for (int j = i + 1; j < size; j++) {
           if(recvbuf[2 * i] == recvbuf[2 * j]) {
             recvbuf[2 * j] = MPI_UNDEFINED;
-            rankmap.push_back({recvbuf[2 * j + 1], j});
+            rankmap.emplace_back(recvbuf[2 * j + 1], j);
           }
         }
         /* Add self in the group */
         recvbuf[2 * i] = MPI_UNDEFINED;
-        rankmap.push_back({recvbuf[2 * i + 1], i});
+        rankmap.emplace_back(recvbuf[2 * i + 1], i);
         std::sort(begin(rankmap), end(rankmap));
         group_out = new Group(rankmap.size());
         if (i == 0) {
@@ -348,18 +348,18 @@ MPI_Comm Comm::find_intra_comm(int * leader){
   int min_index           = INT_MAX; // the minimum index will be the leader
   for (auto& actor : actor_list) {
     int index = actor.get_pid();
-    if (this->group()->rank(actor.ciface()) != MPI_UNDEFINED) { // Is this process in the current group?
+    if (this->group()->rank(actor.get_ciface()) != MPI_UNDEFINED) { // Is this process in the current group?
       intra_comm_size++;
       if (index < min_index)
         min_index = index;
     }
   }
   XBT_DEBUG("number of processes deployed on my node : %d", intra_comm_size);
-  MPI_Group group_intra = new  Group(intra_comm_size);
+  auto* group_intra = new Group(intra_comm_size);
   int i = 0;
   for (auto& actor : actor_list) {
-    if (this->group()->rank(actor.ciface()) != MPI_UNDEFINED) {
-      group_intra->set_mapping(actor.ciface(), i);
+    if (this->group()->rank(actor.get_ciface()) != MPI_UNDEFINED) {
+      group_intra->set_mapping(actor.get_ciface(), i);
       i++;
     }
   }
@@ -390,9 +390,8 @@ void Comm::init_smp(){
   // identify neighbors in comm
   MPI_Comm comm_intra = find_intra_comm(&leader);
 
-
-  int* leaders_map = new int[comm_size];
-  int* leader_list = new int[comm_size];
+  auto* leaders_map = new int[comm_size];
+  auto* leader_list = new int[comm_size];
   std::fill_n(leaders_map, comm_size, 0);
   std::fill_n(leader_list, comm_size, -1);
 
@@ -424,7 +423,7 @@ void Comm::init_smp(){
   xbt_assert(leader_group_size > 0);
   std::sort(leader_list, leader_list + leader_group_size);
 
-  MPI_Group leaders_group = new  Group(leader_group_size);
+  auto* leaders_group = new Group(leader_group_size);
 
   MPI_Comm leader_comm = MPI_COMM_NULL;
   if(MPI_COMM_WORLD!=MPI_COMM_UNINITIALIZED && this!=MPI_COMM_WORLD){