X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b9e79eec822b45eb15b2779f4fa393b07b1e8fff..6260d187764dc644d699e1a53454f7efdcc682df:/src/smpi/mpi/smpi_group.cpp

diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp
index 93fef15478..4b07f918d9 100644
--- a/src/smpi/mpi/smpi_group.cpp
+++ b/src/smpi/mpi/smpi_group.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -9,59 +9,43 @@
 #include <string>
 
 simgrid::smpi::Group smpi_MPI_GROUP_EMPTY;
-extern XBT_PRIVATE MPI_Comm MPI_COMM_UNINITIALIZED;
 
-namespace simgrid{
-namespace smpi{
+namespace simgrid::smpi {
 
 Group::Group(const Group* origin)
 {
   if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) {
-    // FIXME: cheinrich: There is no such thing as an index any more; the two maps should be removed
-    index_to_rank_map_ = origin->index_to_rank_map_;
-    rank_to_actor_map_ = origin->rank_to_actor_map_;
-    actor_to_rank_map_ = origin->actor_to_rank_map_;
+    rank_to_pid_map_ = origin->rank_to_pid_map_;
+    pid_to_rank_map_ = origin->pid_to_rank_map_;
   }
 }
 
-void Group::set_mapping(s4u::Actor* actor, int rank)
+void Group::set_mapping(aid_t pid, int rank)
 {
   if (0 <= rank && rank < size()) {
-    int index = actor->get_pid();
-    if ((unsigned)index >= index_to_rank_map_.size())
-      index_to_rank_map_.resize(index + 1, MPI_UNDEFINED);
-    index_to_rank_map_[index] = rank;
-    rank_to_actor_map_[rank] = actor;
-    actor_to_rank_map_.insert({actor, rank});
+    if (static_cast<size_t>(pid) >= pid_to_rank_map_.size())
+      pid_to_rank_map_.resize(pid + 1, MPI_UNDEFINED);
+    rank_to_pid_map_[rank] = pid;
+    pid_to_rank_map_[pid]  = rank;
   }
 }
 
-int Group::rank(int index) const
+int Group::rank(aid_t pid) const
 {
-  int rank;
-  if (0 <= index && (unsigned)index < index_to_rank_map_.size())
-    rank = index_to_rank_map_[index];
-  else
-    rank = MPI_UNDEFINED;
-
-  return rank;
-}
-
-s4u::Actor* Group::actor(int rank) const
-{
-  if (0 <= rank && rank < size())
-    return rank_to_actor_map_[rank];
-  else
-    return nullptr;
+  int res = static_cast<size_t>(pid) < pid_to_rank_map_.size() ? pid_to_rank_map_[pid] : MPI_UNDEFINED;
+  if (res == MPI_UNDEFINED) {
+    // I'm not in the communicator ... but maybe my parent is?
+    if (auto parent = s4u::Actor::by_pid(pid)) {
+      aid_t ppid = parent->get_ppid();
+      res        = static_cast<size_t>(ppid) < pid_to_rank_map_.size() ? pid_to_rank_map_[ppid] : MPI_UNDEFINED;
+    }
+  }
+  return res;
 }
 
-int Group::rank(s4u::Actor* actor) const
+aid_t Group::actor(int rank) const
 {
-  auto iterator = actor_to_rank_map_.find(actor);
-  //I'm not in the communicator ... but maybe my parent is ?
-  if (iterator == actor_to_rank_map_.end())
-    iterator = actor_to_rank_map_.find(s4u::Actor::by_pid(actor->get_ppid()).get());
-  return (iterator == actor_to_rank_map_.end()) ? MPI_UNDEFINED : (*iterator).second;
+  return (0 <= rank && rank < size()) ? rank_to_pid_map_[rank] : -1;
 }
 
 void Group::ref()
@@ -79,7 +63,7 @@ void Group::unref(Group* group)
   }
 }
 
-int Group::compare(MPI_Group group2) const
+int Group::compare(const Group* group2) const
 {
   int result;
 
@@ -110,19 +94,19 @@ int Group::incl(int n, const int* ranks, MPI_Group* newgroup) const
 
   *newgroup = new Group(n);
   for (int i = 0; i < n; i++) {
-    s4u::Actor* actor = this->actor(ranks[i]);
+    aid_t actor = this->actor(ranks[i]);
     (*newgroup)->set_mapping(actor, i);
   }
   (*newgroup)->add_f();
   return MPI_SUCCESS;
 }
 
-int Group::incl(const std::vector<int> ranks, MPI_Group* newgroup) const
+int Group::incl(const std::vector<int>& ranks, MPI_Group* newgroup) const
 {
   return incl(static_cast<int>(ranks.size()), ranks.data(), newgroup);
 }
 
-int Group::excl(const std::vector<bool> excl_map, MPI_Group* newgroup) const
+int Group::excl(const std::vector<bool>& excl_map, MPI_Group* newgroup) const
 {
   xbt_assert(static_cast<int>(excl_map.size()) == size());
   std::vector<int> ranks;
@@ -132,11 +116,11 @@ int Group::excl(const std::vector<bool> excl_map, MPI_Group* newgroup) const
   return incl(static_cast<int>(ranks.size()), ranks.data(), newgroup);
 }
 
-int Group::group_union(MPI_Group group2, MPI_Group* newgroup) const
+int Group::group_union(const Group* group2, MPI_Group* newgroup) const
 {
   std::vector<int> ranks2;
   for (int i = 0; i < group2->size(); i++) {
-    s4u::Actor* actor = group2->actor(i);
+    aid_t actor = group2->actor(i);
     if (rank(actor) == MPI_UNDEFINED)
       ranks2.push_back(i);
   }
@@ -150,11 +134,11 @@ int Group::group_union(MPI_Group group2, MPI_Group* newgroup) const
   *newgroup = new Group(newsize);
   int i;
   for (i = 0; i < size(); i++) {
-    s4u::Actor* actor1 = actor(i);
+    aid_t actor1 = actor(i);
     (*newgroup)->set_mapping(actor1, i);
   }
   for (int j : ranks2) {
-    s4u::Actor* actor2 = group2->actor(j);
+    aid_t actor2 = group2->actor(j);
     (*newgroup)->set_mapping(actor2, i);
     i++;
   }
@@ -162,22 +146,22 @@ int Group::group_union(MPI_Group group2, MPI_Group* newgroup) const
   return MPI_SUCCESS;
 }
 
-int Group::intersection(MPI_Group group2, MPI_Group* newgroup) const
+int Group::intersection(const Group* group2, MPI_Group* newgroup) const
 {
   std::vector<int> ranks2;
   for (int i = 0; i < group2->size(); i++) {
-    s4u::Actor* actor = group2->actor(i);
+    aid_t actor = group2->actor(i);
     if (rank(actor) != MPI_UNDEFINED)
       ranks2.push_back(i);
   }
   return group2->incl(ranks2, newgroup);
 }
 
-int Group::difference(MPI_Group group2, MPI_Group* newgroup) const
+int Group::difference(const Group* group2, MPI_Group* newgroup) const
 {
   std::vector<int> ranks;
   for (int i = 0; i < size(); i++) {
-    s4u::Actor* actor = this->actor(i);
+    aid_t actor = this->actor(i);
     if (group2->rank(actor) == MPI_UNDEFINED)
       ranks.push_back(i);
   }
@@ -197,7 +181,7 @@ static bool is_rank_in_range(int rank, int first, int last)
   return (first <= rank && rank <= last) || (first >= rank && rank >= last);
 }
 
-int Group::range_incl(int n, int ranges[][3], MPI_Group* newgroup) const
+int Group::range_incl(int n, const int ranges[][3], MPI_Group* newgroup) const
 {
   std::vector<int> ranks;
   for (int i = 0; i < n; i++) {
@@ -208,7 +192,7 @@ int Group::range_incl(int n, int ranges[][3], MPI_Group* newgroup) const
   return this->incl(ranks, newgroup);
 }
 
-int Group::range_excl(int n, int ranges[][3], MPI_Group* newgroup) const
+int Group::range_excl(int n, const int ranges[][3], MPI_Group* newgroup) const
 {
   std::vector<bool> to_excl(size(), false);
   for (int i = 0; i < n; i++) {
@@ -229,5 +213,4 @@ MPI_Group Group::f2c(int id) {
   }
 }
 
-}
-}
+} // namespace simgrid::smpi