X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74c1bf2b26c5a3aa0d8c29674dc12993e7c0de15..c82722a20d8b3e331e865db637b4a0fa9f415d22:/src/smpi/mpi/smpi_comm.cpp diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp index 98300be3f3..3da5bbf07c 100644 --- a/src/smpi/mpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -4,7 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "smpi_comm.hpp" -#include "private.h" #include "private.hpp" #include "simgrid/s4u/Host.hpp" #include "smpi_coll.hpp" @@ -13,7 +12,7 @@ #include "smpi_request.hpp" #include "smpi_status.hpp" #include "smpi_win.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include #include #include @@ -23,6 +22,8 @@ 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; + /* 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. */ @@ -34,14 +35,14 @@ int Comm::keyval_id_=0; Comm::Comm(MPI_Group group, MPI_Topology topo) : group_(group), topo_(topo) { - refcount_=1; - topoType_ = MPI_INVALID_TOPO; - intra_comm_ = MPI_COMM_NULL; - leaders_comm_ = MPI_COMM_NULL; - is_uniform_=1; + 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; + leaders_map_ = nullptr; + is_blocked_ = 0; } void Comm::destroy(Comm* comm) @@ -59,8 +60,8 @@ int Comm::dup(MPI_Comm* newcomm){ smpi_switch_data_segment(smpi_process()->index()); } MPI_Group cp = new Group(this->group()); - (*newcomm) = new Comm(cp, this->topo()); - int ret = MPI_SUCCESS; + (*newcomm) = new Comm(cp, this->topo()); + int ret = MPI_SUCCESS; if (not attributes()->empty()) { int flag; @@ -217,12 +218,12 @@ MPI_Comm Comm::split(int color, int key) group_root = group_out; /* Save root's group */ } for (unsigned j = 0; j < rankmap.size(); j++) { - int index = group->index(rankmap[j].second); - group_out->set_mapping(index, j); + ActorPtr actor = group->actor(rankmap[j].second); + group_out->set_mapping(actor, j); } MPI_Request* requests = xbt_new(MPI_Request, rankmap.size()); int reqs = 0; - for (const auto& rank : rankmap) { + for (auto const& rank : rankmap) { if (rank.second != 0) { group_snd[reqs]=new Group(group_out); requests[reqs] = Request::isend(&(group_snd[reqs]), 1, MPI_PTR, rank.second, system_tag, this); @@ -264,7 +265,7 @@ void Comm::cleanup_smp(){ if (non_uniform_map_ != nullptr) xbt_free(non_uniform_map_); if (leaders_map_ != nullptr) - xbt_free(leaders_map_); + delete[] leaders_map_; } void Comm::unref(Comm* comm){ @@ -302,18 +303,14 @@ void Comm::init_smp(){ smpi_switch_data_segment(smpi_process()->index()); } //identify neighbours in comm - //get the indexes of all processes sharing the same simix host - xbt_swag_t process_list = sg_host_self()->extension()->process_list; + //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 - smx_actor_t actor = nullptr; - xbt_swag_foreach(actor, process_list) - { - int index = actor->pid - 1; - - if (this->group()->rank(index) != MPI_UNDEFINED) { + for (auto& actor : process_list) { + int index = actor.pid - 1; + if (this->group()->rank(actor.iface()) != MPI_UNDEFINED) { // Is this process in the current group? intra_comm_size++; - // the process is in the comm if (index < min_index) min_index = index; } @@ -321,11 +318,10 @@ void Comm::init_smp(){ 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; - actor = nullptr; - xbt_swag_foreach(actor, process_list) { - int index = actor->pid -1; - if(this->group()->rank(index)!=MPI_UNDEFINED){ - group_intra->set_mapping(index, i); + for (auto& actor : process_list) { + // TODO cheinrich : We should not need the const_cast here and above. + if (this->group()->rank(actor.iface()) != MPI_UNDEFINED) { + group_intra->set_mapping(actor.iface(), i); i++; } } @@ -333,11 +329,10 @@ void Comm::init_smp(){ MPI_Comm comm_intra = new Comm(group_intra, nullptr); leader=min_index; - int * leaders_map= static_cast(xbt_malloc0(sizeof(int)*comm_size)); - int * leader_list= static_cast(xbt_malloc0(sizeof(int)*comm_size)); - for(i=0; iset_mapping(leader_list[i], i); + leaders_group->set_mapping(simgrid::s4u::Actor::byPid(leader_list[i]+1), i); leader_comm = new Comm(leaders_group, nullptr); this->set_leaders_comm(leader_comm); this->set_intra_comm(comm_intra); @@ -380,7 +374,7 @@ void Comm::init_smp(){ // create intracommunicator }else{ for (i=0; i< leader_group_size;i++) - leaders_group->set_mapping(leader_list[i], i); + leaders_group->set_mapping(simgrid::s4u::Actor::byPid(leader_list[i]+1), i); if(this->get_leaders_comm()==MPI_COMM_NULL){ leader_comm = new Comm(leaders_group, nullptr); @@ -419,9 +413,9 @@ void Comm::init_smp(){ } // Are the ranks blocked ? = allocated contiguously on the SMP nodes int is_blocked=1; - int prev=this->group()->rank(comm_intra->group()->index(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()->index(i)); + int that = this->group()->rank(comm_intra->group()->actor(i)); if (that != prev + 1) { is_blocked = 0; break; @@ -439,7 +433,7 @@ void Comm::init_smp(){ }else{ is_blocked_=global_blocked; } - xbt_free(leader_list); + delete[] leader_list; if(replaying) smpi_process()->set_replaying(true);