X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d74e061a2eb65f5b3be26db160dad6c5f74d8aff..12623e213e87741da4f0e42917f31b51cf9db0f1:/src/smpi/mpi/smpi_group.cpp diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp index f3715b1594..75a499aa34 100644 --- a/src/smpi/mpi/smpi_group.cpp +++ b/src/smpi/mpi/smpi_group.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2010-2020. 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. */ @@ -7,9 +7,6 @@ #include "smpi_group.hpp" #include "smpi_comm.hpp" #include -#include - -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_group, smpi, "Logging specific to SMPI (group)"); simgrid::smpi::Group mpi_MPI_GROUP_EMPTY; MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY; @@ -17,36 +14,21 @@ MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY; namespace simgrid{ namespace smpi{ -using simgrid::s4u::ActorPtr; - -Group::Group() -{ - size_ = 0; /* size */ - refcount_ = 1; /* refcount_: start > 0 so that this group never gets freed */ -} - -Group::Group(int n) : size_(n), rank_to_actor_map_(size_, nullptr), rank_to_index_map_(size_, MPI_UNDEFINED), index_to_rank_map_(size_, MPI_UNDEFINED) -{ - refcount_ = 1; -} - -Group::Group(MPI_Group origin) +Group::Group(const Group* origin) { if (origin != MPI_GROUP_NULL && origin != MPI_GROUP_EMPTY) { size_ = origin->size(); - refcount_ = 1; - rank_to_index_map_ = origin->rank_to_index_map_; + // 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_; } } -void Group::set_mapping(simgrid::s4u::ActorPtr actor, int rank) +void Group::set_mapping(s4u::Actor* actor, int rank) { if (0 <= rank && rank < size_) { - int index = actor->getPid(); - rank_to_index_map_[rank] = index; + 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); @@ -54,9 +36,7 @@ void Group::set_mapping(simgrid::s4u::ActorPtr actor, int rank) } rank_to_actor_map_[rank] = actor; - if (actor != nullptr) { - actor_to_rank_map_.insert({actor, rank}); - } + actor_to_rank_map_.insert({actor, rank}); } } @@ -71,15 +51,20 @@ int Group::rank(int index) return rank; } -simgrid::s4u::ActorPtr Group::actor(int rank) { +s4u::Actor* Group::actor(int rank) +{ if (0 <= rank && rank < size_) return rank_to_actor_map_[rank]; else return nullptr; } -int Group::rank(const simgrid::s4u::ActorPtr actor) { +int Group::rank(s4u::Actor* actor) +{ 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; } @@ -96,11 +81,6 @@ void Group::unref(Group* group) } } -int Group::size() -{ - return size_; -} - int Group::compare(MPI_Group group2) { int result; @@ -110,7 +90,7 @@ int Group::compare(MPI_Group group2) result = MPI_UNEQUAL; } else { for (int i = 0; i < size_; i++) { - ActorPtr actor = this->actor(i); + s4u::Actor* actor = this->actor(i); int rank = group2->rank(actor); if (rank == MPI_UNDEFINED) { result = MPI_UNEQUAL; @@ -124,9 +104,8 @@ int Group::compare(MPI_Group group2) return result; } -int Group::incl(int n, int* ranks, MPI_Group* newgroup) +int Group::incl(int n, const int* ranks, MPI_Group* newgroup) { - int i=0; if (n == 0) { *newgroup = MPI_GROUP_EMPTY; } else if (n == size_) { @@ -135,8 +114,8 @@ int Group::incl(int n, int* ranks, MPI_Group* newgroup) this->ref(); } else { *newgroup = new Group(n); - for (i = 0; i < n; i++) { - ActorPtr actor = this->actor(ranks[i]); + for (int i = 0; i < n; i++) { + s4u::Actor* actor = this->actor(ranks[i]); // ranks[] was passed as a param! (*newgroup)->set_mapping(actor, i); } } @@ -148,7 +127,7 @@ int Group::group_union(MPI_Group group2, MPI_Group* newgroup) int size1 = size_; int size2 = group2->size(); for (int i = 0; i < size2; i++) { - ActorPtr actor = group2->actor(i); + s4u::Actor* actor = group2->actor(i); int proc1 = this->rank(actor); if (proc1 == MPI_UNDEFINED) { size1++; @@ -160,11 +139,11 @@ int Group::group_union(MPI_Group group2, MPI_Group* newgroup) *newgroup = new Group(size1); size2 = this->size(); for (int i = 0; i < size2; i++) { - ActorPtr actor1 = this->actor(i); + s4u::Actor* actor1 = this->actor(i); (*newgroup)->set_mapping(actor1, i); } for (int i = size2; i < size1; i++) { - ActorPtr actor = group2->actor(i - size2); + s4u::Actor* actor = group2->actor(i - size2); (*newgroup)->set_mapping(actor, i); } } @@ -175,7 +154,7 @@ int Group::intersection(MPI_Group group2, MPI_Group* newgroup) { int size2 = group2->size(); for (int i = 0; i < size2; i++) { - ActorPtr actor = group2->actor(i); + s4u::Actor* actor = group2->actor(i); int proc1 = this->rank(actor); if (proc1 == MPI_UNDEFINED) { size2--; @@ -187,7 +166,7 @@ int Group::intersection(MPI_Group group2, MPI_Group* newgroup) *newgroup = new Group(size2); int j=0; for (int i = 0; i < group2->size(); i++) { - ActorPtr actor = group2->actor(i); + s4u::Actor* actor = group2->actor(i); int proc1 = this->rank(actor); if (proc1 != MPI_UNDEFINED) { (*newgroup)->set_mapping(actor, j); @@ -203,7 +182,7 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup) int newsize = size_; int size2 = size_; for (int i = 0; i < size2; i++) { - ActorPtr actor = this->actor(i); + s4u::Actor* actor = this->actor(i); int proc2 = group2->rank(actor); if (proc2 != MPI_UNDEFINED) { newsize--; @@ -214,7 +193,7 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup) } else { *newgroup = new Group(newsize); for (int i = 0; i < size2; i++) { - ActorPtr actor = this->actor(i); + s4u::Actor* actor = this->actor(i); int proc2 = group2->rank(actor); if (proc2 == MPI_UNDEFINED) { (*newgroup)->set_mapping(actor, i); @@ -224,26 +203,22 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup) return MPI_SUCCESS; } -int Group::excl(int n, int *ranks, MPI_Group * newgroup){ +int Group::excl(int n, const int *ranks, MPI_Group * newgroup){ int oldsize = size_; int newsize = oldsize - n; *newgroup = new Group(newsize); - int* to_exclude = new int[size_]; - for (int i = 0; i < oldsize; i++) - to_exclude[i]=0; - for (int i = 0; i < n; i++) - to_exclude[ranks[i]]=1; + std::vector to_exclude(size_, false); + for (int i = 0; i < n; i++) + to_exclude[ranks[i]] = true; int j = 0; for (int i = 0; i < oldsize; i++) { - if(to_exclude[i]==0){ - ActorPtr actor = this->actor(i); + if (not to_exclude[i]) { + s4u::Actor* actor = this->actor(i); (*newgroup)->set_mapping(actor, j); j++; } } - delete[] to_exclude; return MPI_SUCCESS; - } static bool is_rank_in_range(int rank, int first, int last) @@ -275,7 +250,7 @@ int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){ for (int rank = ranges[i][0]; /* First */ rank >= 0 && rank < size_; /* Last */ ) { - ActorPtr actor = this->actor(rank); + s4u::Actor* actor = this->actor(rank); (*newgroup)->set_mapping(actor, j); j++; if(rank == ranges[i][1]){/*already last ?*/ @@ -327,7 +302,7 @@ int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){ } } if(add==1){ - ActorPtr actor = this->actor(oldrank); + s4u::Actor* actor = this->actor(oldrank); (*newgroup)->set_mapping(actor, newrank); newrank++; } @@ -340,11 +315,10 @@ int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){ MPI_Group Group::f2c(int id) { if(id == -2) { return MPI_GROUP_EMPTY; - } else if(F2C::f2c_lookup() != nullptr && id >= 0) { - char key[KEY_SIZE]; - return static_cast(F2C::f2c_lookup()->at(get_key(key, id))); + } else if (F2C::lookup() != nullptr && id >= 0) { + return static_cast(F2C::lookup()->at(id)); } else { - return static_cast(MPI_GROUP_NULL); + return MPI_GROUP_NULL; } }