-/* Copyright (c) 2010-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2021. 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. */
#include "smpi_group.hpp"
#include "smpi_comm.hpp"
#include <string>
-#include <xbt/log.h>
-
-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;
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), index_to_rank_map_(size_, MPI_UNDEFINED)
-{
- refcount_ = 1;
-}
-
-Group::Group(Group* origin)
+Group::Group(const Group* origin)
{
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_;
}
}
-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->get_pid();
}
rank_to_actor_map_[rank] = actor;
- if (actor != nullptr) {
- actor_to_rank_map_.insert({actor, rank});
- }
+ actor_to_rank_map_.insert({actor, rank});
}
}
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;
}
}
}
-int Group::size()
-{
- return size_;
-}
-
int Group::compare(MPI_Group group2)
{
int result;
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;
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_) {
this->ref();
} else {
*newgroup = new Group(n);
- for (i = 0; i < n; i++) {
- ActorPtr actor = this->actor(ranks[i]); // ranks[] was passed as a param!
+ 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);
}
}
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++;
*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);
}
}
{
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--;
*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);
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--;
} 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);
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<bool> 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)
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 ?*/
}
}
if(add==1){
- ActorPtr actor = this->actor(oldrank);
+ s4u::Actor* actor = this->actor(oldrank);
(*newgroup)->set_mapping(actor, newrank);
newrank++;
}
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<MPI_Group>(F2C::f2c_lookup()->at(get_key(key, id)));
+ } else if (F2C::lookup() != nullptr && id >= 0) {
+ return static_cast<MPI_Group>(F2C::lookup()->at(id));
} else {
- return static_cast<MPI_Group>(MPI_GROUP_NULL);
+ return MPI_GROUP_NULL;
}
}
