A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
address FIXME and kill useless code
[simgrid.git]
/
src
/
smpi
/
mpi
/
smpi_group.cpp
diff --git
a/src/smpi/mpi/smpi_group.cpp
b/src/smpi/mpi/smpi_group.cpp
index
e3eed4d
..
12c412c
100644
(file)
--- a/
src/smpi/mpi/smpi_group.cpp
+++ b/
src/smpi/mpi/smpi_group.cpp
@@
-25,7
+25,7
@@
Group::Group()
refcount_ = 1; /* refcount_: start > 0 so that this group never gets freed */
}
refcount_ = 1; /* refcount_: start > 0 so that this group never gets freed */
}
-Group::Group(int n) : size_(n), rank_to_actor_map_(size_, nullptr)
, index_to_rank_map_(size_, MPI_UNDEFINED)
+Group::Group(int n) : size_(n), rank_to_actor_map_(size_, nullptr)
{
refcount_ = 1;
}
{
refcount_ = 1;
}
@@
-35,8
+35,6
@@
Group::Group(Group* origin)
if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) {
size_ = origin->size();
refcount_ = 1;
if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) {
size_ = origin->size();
refcount_ = 1;
- // 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_actor_map_ = origin->rank_to_actor_map_;
actor_to_rank_map_ = origin->actor_to_rank_map_;
}
@@
-46,11
+44,6
@@
void Group::set_mapping(simgrid::s4u::ActorPtr actor, int rank)
{
if (0 <= rank && rank < size_) {
int index = actor->get_pid();
{
if (0 <= rank && rank < size_) {
int index = actor->get_pid();
- if (index != MPI_UNDEFINED) {
- 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;
if (actor != nullptr) {
rank_to_actor_map_[rank] = actor;
if (actor != nullptr) {
@@
-59,17
+52,6
@@
void Group::set_mapping(simgrid::s4u::ActorPtr actor, int rank)
}
}
}
}
-int Group::rank(int index)
-{
- int rank;
- if (0 <= index && (unsigned)index < index_to_rank_map_.size())
- rank = index_to_rank_map_[index];
- else
- rank = MPI_UNDEFINED;
-
- return rank;
-}
-
simgrid::s4u::ActorPtr Group::actor(int rank) {
if (0 <= rank && rank < size_)
return rank_to_actor_map_[rank];
simgrid::s4u::ActorPtr Group::actor(int rank) {
if (0 <= rank && rank < size_)
return rank_to_actor_map_[rank];