X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/77bbf3027c4240a2e833209a3a3f186589da8577..f807f3ecd43bd280674b57f277d3af275fbfbaa5:/src/smpi/include/smpi_group.hpp

diff --git a/src/smpi/include/smpi_group.hpp b/src/smpi/include/smpi_group.hpp
index 1bb4d1711a..d6538120ed 100644
--- a/src/smpi/include/smpi_group.hpp
+++ b/src/smpi/include/smpi_group.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013-2017. The SimGrid Team.
+/* Copyright (c) 2010-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,43 +9,48 @@
 
 #include "smpi_f2c.hpp"
 #include <smpi/smpi.h>
+#include <map>
 #include <vector>
 
 namespace simgrid{
 namespace smpi{
 
 class Group : public F2C{
-  private:
-    int size_;
-    /* This is actually a map from int to int. 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.
-     */
-    std::vector<int> rank_to_index_map_;
-    std::vector<int> index_to_rank_map_;
-    int refcount_;
-  public:
-    explicit Group();
-    explicit Group(int size);
-    explicit Group(Group* origin);
-
-    void set_mapping(int index, int rank);
-    int index(int rank);
-    int rank(int index);
-    void ref();
-    static void unref(MPI_Group group);
-    int size();
-    int compare(MPI_Group group2);
-    int incl(int n, int* ranks, MPI_Group* newgroup);
-    int excl(int n, int *ranks, MPI_Group * newgroup);
-    int group_union(MPI_Group group2, MPI_Group* newgroup);
-    int intersection(MPI_Group group2, MPI_Group* newgroup);
-    int difference(MPI_Group group2, MPI_Group* newgroup);
-    int range_incl(int n, int ranges[][3], MPI_Group * newgroup);
-    int range_excl(int n, int ranges[][3], MPI_Group * newgroup);
-
-    static Group* f2c(int id);
-
+  /* 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.
+   */
+  std::map<s4u::Actor*, int> actor_to_rank_map_;
+  std::vector<aid_t> rank_to_pid_map_;
+  std::vector<int> pid_to_rank_map_;
+
+  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) : rank_to_pid_map_(size, -1), pid_to_rank_map_(size, MPI_UNDEFINED) {}
+  explicit Group(const Group* origin);
+
+  void set_mapping(aid_t pid, int rank);
+  int rank(aid_t pid) const;
+  aid_t actor_pid(int rank) const;
+  std::string name() const override {return std::string("MPI_Group");}
+  int rank(s4u::Actor* process) const;
+  void ref();
+  static void unref(MPI_Group group);
+  int size() const { return static_cast<int>(rank_to_pid_map_.size()); }
+  int compare(const 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;
+  int group_union(const Group* group2, MPI_Group* newgroup) const;
+  int intersection(const Group* group2, MPI_Group* newgroup) const;
+  int difference(const Group* group2, MPI_Group* newgroup) const;
+  int range_incl(int n, const int ranges[][3], MPI_Group* newgroup) const;
+  int range_excl(int n, const int ranges[][3], MPI_Group* newgroup) const;
+
+  static Group* f2c(int id);
 };
 }
 }