X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d68dcbd4cd142d73e90ab9376c34a435c10e1dc6..90aa31f25a893303cd2884e66acd76c1bc57d976:/src/smpi/mpi/smpi_comm.cpp diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index af7bd41886..2dceee2898 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -1,30 +1,33 @@ -/* Copyright (c) 2010-2018. 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_comm.hpp" -#include "private.hpp" -#include "simgrid/s4u/Host.hpp" #include "smpi_coll.hpp" #include "smpi_datatype.hpp" -#include "smpi_process.hpp" #include "smpi_request.hpp" -#include "smpi_status.hpp" #include "smpi_win.hpp" -#include "src/simix/smx_host_private.hpp" -#include "src/simix/smx_private.hpp" +#include "smpi_info.hpp" +#include "src/smpi/include/smpi_actor.hpp" +#include "src/surf/HostImpl.hpp" -#include -#include -#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)"); -simgrid::smpi::Comm mpi_MPI_COMM_UNINITIALIZED; -MPI_Comm MPI_COMM_UNINITIALIZED=&mpi_MPI_COMM_UNINITIALIZED; - -using simgrid::s4u::ActorPtr; +simgrid::smpi::Comm smpi_MPI_COMM_UNINITIALIZED; +MPI_Comm MPI_COMM_UNINITIALIZED=&smpi_MPI_COMM_UNINITIALIZED; +/** + * Setting MPI_COMM_WORLD to MPI_COMM_UNINITIALIZED (it's a variable) + * is important because the implementation of MPI_Comm checks + * "this == MPI_COMM_UNINITIALIZED"? If yes, it uses smpi_process()->comm_world() + * instead of "this". + * This is basically how we only have one global variable but all processes have + * different communicators (the one their SMPI instance uses). + * + */ +MPI_Comm MPI_COMM_WORLD = MPI_COMM_UNINITIALIZED; /* Support for cartesian topology was added, but there are 2 other types of topology, graph et dist graph. In order to * support them, we have to add a field SMPI_Topo_type, and replace the MPI_Topology field by an union. */ @@ -35,16 +38,25 @@ namespace smpi{ std::unordered_map Comm::keyvals_; int Comm::keyval_id_=0; -Comm::Comm(MPI_Group group, MPI_Topology topo) : group_(group), topo_(topo) +Comm::Comm(MPI_Group group, MPI_Topology topo, bool smp, int in_id) + : group_(group), topo_(topo), is_smp_comm_(smp), id_(in_id) { - refcount_ = 1; - topoType_ = MPI_INVALID_TOPO; - intra_comm_ = MPI_COMM_NULL; - leaders_comm_ = MPI_COMM_NULL; - is_uniform_ = 1; - non_uniform_map_ = nullptr; - leaders_map_ = nullptr; - is_blocked_ = 0; + errhandler_->ref(); + //First creation of comm is done before SIMIX_run, so only do comms for others + if(in_id==MPI_UNDEFINED && smp==0 && this->rank()!=MPI_UNDEFINED ){ + this->add_f(); + group->c2f(); + int id; + if(this->rank()==0){ + static int global_id_ = 0; + id=global_id_; + global_id_++; + } + colls::bcast(&id, 1, MPI_INT, 0, this); + XBT_DEBUG("Communicator %p has id %d", this, id); + id_=id;//only set here, as we don't want to change it in the middle of the bcast + colls::barrier(this); + } } void Comm::destroy(Comm* comm) @@ -53,38 +65,78 @@ void Comm::destroy(Comm* comm) Comm::destroy(smpi_process()->comm_world()); return; } - delete comm->topo_; // there's no use count on topos + if (comm != MPI_COMM_WORLD && not comm->deleted()) { + comm->cleanup_attr(); + comm->mark_as_deleted(); + } Comm::unref(comm); } int Comm::dup(MPI_Comm* newcomm){ - if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) { - // we need to switch as the called function may silently touch global variables - smpi_switch_data_segment(simgrid::s4u::Actor::self()); - } - MPI_Group cp = new Group(this->group()); + // we need to switch as the called function may silently touch global variables + smpi_switch_data_segment(s4u::Actor::self()); + + auto* cp = new Group(this->group()); (*newcomm) = new Comm(cp, this->topo()); - int ret = MPI_SUCCESS; - - if (not attributes()->empty()) { - int flag; - void* value_out; - for (auto const& it : *attributes()) { - smpi_key_elem elem = keyvals_.at(it.first); - if (elem != nullptr && elem->copy_fn.comm_copy_fn != MPI_NULL_COPY_FN) { - ret = elem->copy_fn.comm_copy_fn(this, it.first, nullptr, it.second, &value_out, &flag); - if (ret != MPI_SUCCESS) { - Comm::destroy(*newcomm); - *newcomm = MPI_COMM_NULL; - return ret; - } - if (flag){ - elem->refcount++; - (*newcomm)->attributes()->insert({it.first, value_out}); - } + + for (auto const& it : attributes()) { + auto elem_it = keyvals_.find(it.first); + xbt_assert(elem_it != keyvals_.end(), "Keyval not found for Comm: %d", it.first); + + smpi_key_elem& elem = elem_it->second; + int ret = MPI_SUCCESS; + int flag = 0; + void* value_out = nullptr; + if (elem.copy_fn.comm_copy_fn == MPI_COMM_DUP_FN) { + value_out = it.second; + flag = 1; + } else if (elem.copy_fn.comm_copy_fn != MPI_NULL_COPY_FN) { + ret = elem.copy_fn.comm_copy_fn(this, it.first, elem.extra_state, it.second, &value_out, &flag); + } + if (elem.copy_fn.comm_copy_fn_fort != MPI_NULL_COPY_FN) { + value_out = xbt_new(int, 1); + if (*(int*)*elem.copy_fn.comm_copy_fn_fort == 1) { // MPI_COMM_DUP_FN + memcpy(value_out, it.second, sizeof(int)); + flag = 1; + } else { // not null, nor dup + elem.copy_fn.comm_copy_fn_fort(this, it.first, elem.extra_state, it.second, value_out, &flag, &ret); } + if (ret != MPI_SUCCESS) + xbt_free(value_out); + } + if (ret != MPI_SUCCESS) { + Comm::destroy(*newcomm); + *newcomm = MPI_COMM_NULL; + return ret; + } + if (flag) { + elem.refcount++; + (*newcomm)->attributes().emplace(it.first, value_out); } } + //duplicate info if present + if(info_!=MPI_INFO_NULL) + (*newcomm)->info_ = new simgrid::smpi::Info(info_); + //duplicate errhandler + if (errhandlers_ != nullptr)//MPI_COMM_WORLD, only grab our own + (*newcomm)->set_errhandler(errhandlers_[this->rank()]); + else + (*newcomm)->set_errhandler(errhandler_); + return MPI_SUCCESS; +} + +int Comm::dup_with_info(MPI_Info info, MPI_Comm* newcomm){ + int ret = dup(newcomm); + if(ret != MPI_SUCCESS) + return ret; + if((*newcomm)->info_!=MPI_INFO_NULL){ + simgrid::smpi::Info::unref((*newcomm)->info_); + (*newcomm)->info_=MPI_INFO_NULL; + } + if(info != MPI_INFO_NULL){ + info->ref(); + (*newcomm)->info_=info; + } return ret; } @@ -95,38 +147,61 @@ MPI_Group Comm::group() return group_; } -MPI_Topology Comm::topo() { - return topo_; -} - -int Comm::size() +int Comm::size() const { if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->size(); return group_->size(); } -int Comm::rank() +int Comm::rank() const { if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->rank(); - return group_->rank(simgrid::s4u::Actor::self()); + return group_->rank(s4u::this_actor::get_pid()); } -void Comm::get_name (char* name, int* len) +int Comm::id() const +{ + return id_; +} + +void Comm::get_name(char* name, int* len) const { if (this == MPI_COMM_UNINITIALIZED){ smpi_process()->comm_world()->get_name(name, len); return; } - if(this == MPI_COMM_WORLD) { - strncpy(name, "WORLD",5); - *len = 5; + if(this == MPI_COMM_WORLD && name_.empty()) { + strncpy(name, "MPI_COMM_WORLD", 15); + *len = 14; } else { - *len = snprintf(name, MPI_MAX_NAME_STRING, "%p", this); + *len = snprintf(name, MPI_MAX_NAME_STRING+1, "%s", name_.c_str()); + } +} + +std::string Comm::name() const +{ + int size; + std::array name; + this->get_name(name.data(), &size); + if (name[0]=='\0') + return std::string("MPI_Comm"); + else + return std::string(name.data()); +} + + +void Comm::set_name (const char* name) +{ + if (this == MPI_COMM_UNINITIALIZED){ + smpi_process()->comm_world()->set_name(name); + return; } + name_.replace (0, MPI_MAX_NAME_STRING+1, name); } + void Comm::set_leaders_comm(MPI_Comm leaders){ if (this == MPI_COMM_UNINITIALIZED){ smpi_process()->comm_world()->set_leaders_comm(leaders); @@ -135,72 +210,75 @@ void Comm::set_leaders_comm(MPI_Comm leaders){ leaders_comm_=leaders; } -void Comm::set_intra_comm(MPI_Comm leaders){ - intra_comm_=leaders; -} - -int* Comm::get_non_uniform_map(){ +int* Comm::get_non_uniform_map() const +{ if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->get_non_uniform_map(); return non_uniform_map_; } -int* Comm::get_leaders_map(){ +int* Comm::get_leaders_map() const +{ if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->get_leaders_map(); return leaders_map_; } -MPI_Comm Comm::get_leaders_comm(){ +MPI_Comm Comm::get_leaders_comm() const +{ if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->get_leaders_comm(); return leaders_comm_; } -MPI_Comm Comm::get_intra_comm(){ +MPI_Comm Comm::get_intra_comm() const +{ if (this == MPI_COMM_UNINITIALIZED || this==MPI_COMM_WORLD) return smpi_process()->comm_intra(); else return intra_comm_; } -int Comm::is_uniform(){ +bool Comm::is_uniform() const +{ if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->is_uniform(); - return is_uniform_; + return is_uniform_ != 0; } -int Comm::is_blocked(){ +bool Comm::is_blocked() const +{ if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->is_blocked(); - return is_blocked_; + return is_blocked_ != 0; +} + +bool Comm::is_smp_comm() const +{ + if (this == MPI_COMM_UNINITIALIZED) + return smpi_process()->comm_world()->is_smp_comm(); + return is_smp_comm_; } MPI_Comm Comm::split(int color, int key) { if (this == MPI_COMM_UNINITIALIZED) return smpi_process()->comm_world()->split(color, key); - int system_tag = 123; - int* recvbuf; + int system_tag = -123; MPI_Group group_root = nullptr; MPI_Group group_out = nullptr; - MPI_Group group = this->group(); - int rank = this->rank(); + const Group* group = this->group(); + int myrank = this->rank(); int size = this->size(); /* Gather all colors and keys on rank 0 */ - int* sendbuf = xbt_new(int, 2); - sendbuf[0] = color; - sendbuf[1] = key; - if(rank == 0) { - recvbuf = xbt_new(int, 2 * size); - } else { - recvbuf = nullptr; - } - Coll_gather_default::gather(sendbuf, 2, MPI_INT, recvbuf, 2, MPI_INT, 0, this); - xbt_free(sendbuf); + const std::array sendbuf = {{color, key}}; + std::vector recvbuf; + if (myrank == 0) + recvbuf.resize(2 * size); + gather__default(sendbuf.data(), 2, MPI_INT, recvbuf.data(), 2, MPI_INT, 0, this); /* Do the actual job */ - if(rank == 0) { - MPI_Group* group_snd = xbt_new(MPI_Group, size); + if (myrank == 0) { + std::vector group_snd(size); std::vector> rankmap; rankmap.reserve(size); for (int i = 0; i < size; i++) { @@ -209,22 +287,22 @@ MPI_Comm Comm::split(int color, int key) for (int j = i + 1; j < size; j++) { if(recvbuf[2 * i] == recvbuf[2 * j]) { recvbuf[2 * j] = MPI_UNDEFINED; - rankmap.push_back({recvbuf[2 * j + 1], j}); + rankmap.emplace_back(recvbuf[2 * j + 1], j); } } /* Add self in the group */ recvbuf[2 * i] = MPI_UNDEFINED; - rankmap.push_back({recvbuf[2 * i + 1], i}); + rankmap.emplace_back(recvbuf[2 * i + 1], i); std::sort(begin(rankmap), end(rankmap)); group_out = new Group(rankmap.size()); if (i == 0) { group_root = group_out; /* Save root's group */ } for (unsigned j = 0; j < rankmap.size(); j++) { - ActorPtr actor = group->actor(rankmap[j].second); + aid_t actor = group->actor(rankmap[j].second); group_out->set_mapping(actor, j); } - MPI_Request* requests = xbt_new(MPI_Request, rankmap.size()); + std::vector requests(rankmap.size()); int reqs = 0; for (auto const& rank : rankmap) { if (rank.second != 0) { @@ -236,19 +314,16 @@ MPI_Comm Comm::split(int color, int key) if(i != 0 && group_out != MPI_COMM_WORLD->group() && group_out != MPI_GROUP_EMPTY) Group::unref(group_out); - Request::waitall(reqs, requests, MPI_STATUS_IGNORE); - xbt_free(requests); + Request::waitall(reqs, requests.data(), MPI_STATUS_IGNORE); } } - xbt_free(recvbuf); - xbt_free(group_snd); group_out = group_root; /* exit with root's group */ } else { if(color != MPI_UNDEFINED) { Request::recv(&group_out, 1, MPI_PTR, 0, system_tag, this, MPI_STATUS_IGNORE); } /* otherwise, exit with group_out == nullptr */ } - return group_out!=nullptr ? new Comm(group_out, nullptr) : MPI_COMM_NULL; + return group_out!=nullptr ? new Comm(group_out, topo_) : MPI_COMM_NULL; } void Comm::ref(){ @@ -265,10 +340,8 @@ void Comm::cleanup_smp(){ Comm::unref(intra_comm_); if (leaders_comm_ != MPI_COMM_NULL) Comm::unref(leaders_comm_); - if (non_uniform_map_ != nullptr) - xbt_free(non_uniform_map_); - if (leaders_map_ != nullptr) - delete[] leaders_map_; + xbt_free(non_uniform_map_); + delete[] leaders_map_; } void Comm::unref(Comm* comm){ @@ -277,18 +350,55 @@ void Comm::unref(Comm* comm){ return; } comm->refcount_--; - Group::unref(comm->group_); if(comm->refcount_==0){ + if(simgrid::smpi::F2C::lookup() != nullptr) + F2C::free_f(comm->f2c_id()); comm->cleanup_smp(); comm->cleanup_attr(); - delete comm; + if (comm->info_ != MPI_INFO_NULL) + simgrid::smpi::Info::unref(comm->info_); + if(comm->errhandlers_!=nullptr){ + for (int i=0; isize(); i++) + if (comm->errhandlers_[i]!=MPI_ERRHANDLER_NULL) + simgrid::smpi::Errhandler::unref(comm->errhandlers_[i]); + delete[] comm->errhandlers_; + } else if (comm->errhandler_ != MPI_ERRHANDLER_NULL) + simgrid::smpi::Errhandler::unref(comm->errhandler_); } + Group::unref(comm->group_); + if(comm->refcount_==0) + delete comm; +} + +MPI_Comm Comm::find_intra_comm(int * leader){ + //get the indices of all processes sharing the same simix host + int intra_comm_size = 0; + aid_t min_index = std::numeric_limits::max(); // the minimum index will be the leader + sg_host_self()->get_impl()->foreach_actor([this, &intra_comm_size, &min_index](auto& actor) { + aid_t index = actor.get_pid(); + if (this->group()->rank(index) != MPI_UNDEFINED) { // Is this process in the current group? + intra_comm_size++; + if (index < min_index) + min_index = index; + } + }); + XBT_DEBUG("number of processes deployed on my node : %d", intra_comm_size); + auto* group_intra = new Group(intra_comm_size); + int i = 0; + sg_host_self()->get_impl()->foreach_actor([this, group_intra, &i](auto& actor) { + if (this->group()->rank(actor.get_pid()) != MPI_UNDEFINED) { + group_intra->set_mapping(actor.get_pid(), i); + i++; + } + }); + *leader=min_index; + return new Comm(group_intra, nullptr, true); } void Comm::init_smp(){ int leader = -1; - + int i = 0; if (this == MPI_COMM_UNINITIALIZED) smpi_process()->comm_world()->init_smp(); @@ -302,47 +412,18 @@ void Comm::init_smp(){ smpi_process()->set_replaying(false); } - if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) { - // we need to switch as the called function may silently touch global variables - smpi_switch_data_segment(simgrid::s4u::Actor::self()); - } - //identify neighbours in comm - //get the indices of all processes sharing the same simix host - auto& process_list = sg_host_self()->extension()->process_list; - int intra_comm_size = 0; - int min_index = INT_MAX; // the minimum index will be the leader - for (auto& actor : process_list) { - int index = actor.pid; - if (this->group()->rank(actor.iface()) != MPI_UNDEFINED) { // Is this process in the current group? - intra_comm_size++; - if (index < min_index) - min_index = index; - } - } - XBT_DEBUG("number of processes deployed on my node : %d", intra_comm_size); - MPI_Group group_intra = new Group(intra_comm_size); - int i = 0; - for (auto& actor : process_list) { - if (this->group()->rank(actor.iface()) != MPI_UNDEFINED) { - group_intra->set_mapping(actor.iface(), i); - i++; - } - } + // we need to switch as the called function may silently touch global variables + smpi_switch_data_segment(s4u::Actor::self()); - MPI_Comm comm_intra = new Comm(group_intra, nullptr); - leader=min_index; + // identify neighbors in comm + MPI_Comm comm_intra = find_intra_comm(&leader); - int* leaders_map = new int[comm_size]; - int* leader_list = new int[comm_size]; + auto* leaders_map = new int[comm_size]; + auto* leader_list = new int[comm_size]; std::fill_n(leaders_map, comm_size, 0); std::fill_n(leader_list, comm_size, -1); - Coll_allgather_mpich::allgather(&leader, 1, MPI_INT , leaders_map, 1, MPI_INT, this); - - if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) { - // we need to switch as the called function may silently touch global variables - smpi_switch_data_segment(simgrid::s4u::Actor::self()); - } + allgather__ring(&leader, 1, MPI_INT , leaders_map, 1, MPI_INT, this); if(leaders_map_==nullptr){ leaders_map_= leaders_map; @@ -362,26 +443,27 @@ void Comm::init_smp(){ leader_group_size++; } } + xbt_assert(leader_group_size > 0); std::sort(leader_list, leader_list + leader_group_size); - MPI_Group leaders_group = new Group(leader_group_size); + auto* leaders_group = new Group(leader_group_size); MPI_Comm leader_comm = MPI_COMM_NULL; if(MPI_COMM_WORLD!=MPI_COMM_UNINITIALIZED && this!=MPI_COMM_WORLD){ //create leader_communicator for (i=0; i< leader_group_size;i++) - leaders_group->set_mapping(simgrid::s4u::Actor::by_pid(leader_list[i]), i); - leader_comm = new Comm(leaders_group, nullptr); + leaders_group->set_mapping(leader_list[i], i); + leader_comm = new Comm(leaders_group, nullptr, true); this->set_leaders_comm(leader_comm); this->set_intra_comm(comm_intra); // create intracommunicator }else{ for (i=0; i< leader_group_size;i++) - leaders_group->set_mapping(simgrid::s4u::Actor::by_pid(leader_list[i]), i); + leaders_group->set_mapping(leader_list[i], i); if(this->get_leaders_comm()==MPI_COMM_NULL){ - leader_comm = new Comm(leaders_group, nullptr); + leader_comm = new Comm(leaders_group, nullptr, true); this->set_leaders_comm(leader_comm); }else{ leader_comm=this->get_leaders_comm(); @@ -394,8 +476,8 @@ void Comm::init_smp(){ int my_local_size=comm_intra->size(); if(comm_intra->rank()==0) { int is_uniform = 1; - int* non_uniform_map = xbt_new0(int,leader_group_size); - Coll_allgather_mpich::allgather(&my_local_size, 1, MPI_INT, + auto* non_uniform_map = xbt_new0(int, leader_group_size); + allgather__ring(&my_local_size, 1, MPI_INT, non_uniform_map, 1, MPI_INT, leader_comm); for(i=0; i < leader_group_size; i++) { if(non_uniform_map[0] != non_uniform_map[i]) { @@ -403,22 +485,21 @@ void Comm::init_smp(){ break; } } - if(is_uniform==0 && this->is_uniform()!=0){ + if (is_uniform == 0 && this->is_uniform()) { non_uniform_map_ = non_uniform_map; }else{ xbt_free(non_uniform_map); } is_uniform_=is_uniform; } - Coll_bcast_mpich::bcast(&(is_uniform_),1, MPI_INT, 0, comm_intra ); + bcast__scatter_LR_allgather(&is_uniform_, 1, MPI_INT, 0, comm_intra); + + // we need to switch as the called function may silently touch global variables + smpi_switch_data_segment(s4u::Actor::self()); - if (smpi_privatize_global_variables == SmpiPrivStrategies::Mmap) { - // we need to switch as the called function may silently touch global variables - smpi_switch_data_segment(simgrid::s4u::Actor::self()); - } // Are the ranks blocked ? = allocated contiguously on the SMP nodes int is_blocked=1; - int prev=this->group()->rank(comm_intra->group()->actor(0)); + int prev = this->group()->rank(comm_intra->group()->actor(0)); for (i = 1; i < my_local_size; i++) { int that = this->group()->rank(comm_intra->group()->actor(i)); if (that != prev + 1) { @@ -429,7 +510,7 @@ void Comm::init_smp(){ } int global_blocked; - Coll_allreduce_default::allreduce(&is_blocked, &(global_blocked), 1, MPI_INT, MPI_LAND, this); + allreduce__default(&is_blocked, &global_blocked, 1, MPI_INT, MPI_LAND, this); if(MPI_COMM_WORLD==MPI_COMM_UNINITIALIZED || this==MPI_COMM_WORLD){ if(this->rank()==0){ @@ -449,10 +530,9 @@ MPI_Comm Comm::f2c(int id) { return MPI_COMM_SELF; } else if(id==0){ return MPI_COMM_WORLD; - } else if(F2C::f2c_lookup() != nullptr && id >= 0) { - char key[KEY_SIZE]; - const auto& lookup = F2C::f2c_lookup(); - auto comm = lookup->find(get_key_id(key, id)); + } else if (F2C::lookup() != nullptr && id >= 0) { + const auto& lookup = F2C::lookup(); + auto comm = lookup->find(id); return comm == lookup->end() ? MPI_COMM_NULL : static_cast(comm->second); } else { return MPI_COMM_NULL; @@ -460,18 +540,7 @@ MPI_Comm Comm::f2c(int id) { } void Comm::free_f(int id) { - char key[KEY_SIZE]; - F2C::f2c_lookup()->erase(id == 0 ? get_key(key, id) : get_key_id(key, id)); -} - -int Comm::add_f() { - if(F2C::f2c_lookup()==nullptr){ - F2C::set_f2c_lookup(new std::unordered_map); - } - char key[KEY_SIZE]; - (*(F2C::f2c_lookup()))[this == MPI_COMM_WORLD ? get_key(key, F2C::f2c_id()) : get_key_id(key, F2C::f2c_id())] = this; - f2c_id_increment(); - return F2C::f2c_id()-1; + F2C::lookup()->erase(id); } void Comm::add_rma_win(MPI_Win win){ @@ -482,16 +551,84 @@ void Comm::remove_rma_win(MPI_Win win){ rma_wins_.remove(win); } -void Comm::finish_rma_calls(){ +void Comm::finish_rma_calls() const +{ + const int myrank = rank(); for (auto const& it : rma_wins_) { - if(it->rank()==this->rank()){//is it ours (for MPI_COMM_WORLD)? + if (it->rank() == myrank) { // is it ours (for MPI_COMM_WORLD)? int finished = it->finish_comms(); - XBT_DEBUG("Barrier for rank %d - Finished %d RMA calls",this->rank(), finished); + XBT_DEBUG("Barrier for rank %d - Finished %d RMA calls", myrank, finished); } } } +MPI_Info Comm::info() +{ + return info_; +} + +void Comm::set_info(MPI_Info info) +{ + if (info_ != MPI_INFO_NULL) + simgrid::smpi::Info::unref(info); + info_ = info; + if (info_ != MPI_INFO_NULL) + info->ref(); +} + +MPI_Errhandler Comm::errhandler() +{ + if (this != MPI_COMM_WORLD){ + if (errhandler_ != MPI_ERRHANDLER_NULL) + errhandler_->ref(); + return errhandler_; + } else { + if(errhandlers_==nullptr){ + if (_smpi_cfg_default_errhandler_is_error) + return MPI_ERRORS_ARE_FATAL; + else + return MPI_ERRORS_RETURN; + } else { + if(errhandlers_[this->rank()] != MPI_ERRHANDLER_NULL) + errhandlers_[this->rank()]->ref(); + return errhandlers_[this->rank()]; + } + } } + +void Comm::set_errhandler(MPI_Errhandler errhandler) +{ + if(this != MPI_COMM_WORLD){ + if (errhandler_ != MPI_ERRHANDLER_NULL) + simgrid::smpi::Errhandler::unref(errhandler_); + errhandler_ = errhandler; + }else{ + if(errhandlers_==nullptr) + errhandlers_= new MPI_Errhandler[this->size()]{MPI_ERRHANDLER_NULL}; + if(errhandlers_[this->rank()] != MPI_ERRHANDLER_NULL) + simgrid::smpi::Errhandler::unref(errhandlers_[this->rank()]); + errhandlers_[this->rank()]=errhandler; + } + if (errhandler != MPI_ERRHANDLER_NULL) + errhandler->ref(); } +MPI_Comm Comm::split_type(int type, int /*key*/, const Info*) +{ + //MPI_UNDEFINED can be given to some nodes... but we need them to still perform the smp part which is collective + if(type != MPI_COMM_TYPE_SHARED && type != MPI_UNDEFINED){ + return MPI_COMM_NULL; + } + int leader=0; + MPI_Comm res= this->find_intra_comm(&leader); + if(type != MPI_UNDEFINED) + return res; + else{ + xbt_assert(res->refcount_ == 1); // ensure the next call to Comm::destroy really frees the comm + Comm::destroy(res); + return MPI_COMM_NULL; + } +} +} // namespace smpi +} // namespace simgrid