Reduce code duplication (and fix bug in Group::difference).

[simgrid.git] / src / smpi / include / smpi_group.hpp

diff --git a/src/smpi/include/smpi_group.hpp b/src/smpi/include/smpi_group.hpp
index 45edeef8524d354b95b6b13b8cbc6573868952b6..99be12735aa6106ce6e83ffa92345ad8a7752677 100644 (file)
--- a/src/smpi/include/smpi_group.hpp
+++ b/src/smpi/include/smpi_group.hpp
@@ -16,7 +16,6 @@ namespace simgrid{
 namespace smpi{
 
 class Group : public F2C{
-  int size_ = 0;
   /* This is actually a map from int to s4u::Actor*. We could use std::map here, but looking up a value there costs
    * O(log(n)). For a vector, this costs O(1). We hence go with the vector.
    */
@@ -26,9 +25,12 @@ class Group : public F2C{
 
   int refcount_ = 1; /* refcount_: start > 0 so that this group never gets freed */
 
+  int incl(const std::vector<int> ranks, MPI_Group* newgroup) const;
+  int excl(const std::vector<bool> excl_map, MPI_Group* newgroup) const;
+
 public:
   Group() = default;
-  explicit Group(int size) : size_(size), rank_to_actor_map_(size, nullptr), index_to_rank_map_(size, MPI_UNDEFINED) {}
+  explicit Group(int size) : rank_to_actor_map_(size, nullptr), index_to_rank_map_(size, MPI_UNDEFINED) {}
   explicit Group(const Group* origin);
 
   void set_mapping(s4u::Actor* actor, int rank);
@@ -38,7 +40,7 @@ public:
   int rank(s4u::Actor* process) const;
   void ref();
   static void unref(MPI_Group group);
-  int size() const { return size_; }
+  int size() const { return static_cast<int>(rank_to_actor_map_.size()); }
   int compare(MPI_Group group2) const;
   int incl(int n, const int* ranks, MPI_Group* newgroup) const;
   int excl(int n, const int* ranks, MPI_Group* newgroup) const;