X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0a93e4a39449acfaf3679a8ae852752e83230233..f50c785a8f726657dc3b4e32de522a7b3baca707:/src/smpi/smpi_comm.cpp diff --git a/src/smpi/smpi_comm.cpp b/src/smpi/smpi_comm.cpp index 489af18bc0..d5e043e922 100644 --- a/src/smpi/smpi_comm.cpp +++ b/src/smpi/smpi_comm.cpp @@ -14,17 +14,11 @@ #include #include "private.h" -#include "smpi_mpi_dt_private.h" #include "src/simix/smx_private.h" -#include "colls/colls.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)"); -xbt_dict_t smpi_comm_keyvals = nullptr; -int comm_keyval_id = 0;//avoid collisions - - -simgrid::smpi::Comm mpi_MPI_COMM_UNINITIALIZED; + Comm mpi_MPI_COMM_UNINITIALIZED; MPI_Comm MPI_COMM_UNINITIALIZED=&mpi_MPI_COMM_UNINITIALIZED; /* Support for cartesian topology was added, but there are 2 other types of topology, graph et dist graph. In order to @@ -53,7 +47,8 @@ static int smpi_compare_rankmap(const void *a, const void *b) namespace simgrid{ namespace smpi{ -Comm::Comm(){} +std::unordered_map Comm::keyvals_; +int Comm::keyval_id_=0; Comm::Comm(MPI_Group group, MPI_Topology topo) : group_(group), topo_(topo) { @@ -65,47 +60,42 @@ Comm::Comm(MPI_Group group, MPI_Topology topo) : group_(group), topo_(topo) non_uniform_map_ = nullptr; leaders_map_ = nullptr; is_blocked_=0; - attributes_=nullptr; } -void Comm::destroy() +void Comm::destroy(Comm* comm) { - if (this == MPI_COMM_UNINITIALIZED){ - smpi_process_comm_world()->destroy(); + if (comm == MPI_COMM_UNINITIALIZED){ + Comm::destroy(smpi_process_comm_world()); return; } - delete topo_; // there's no use count on topos - this->unuse(); + delete comm->topo_; // there's no use count on topos + Comm::unref(comm); } int Comm::dup(MPI_Comm* newcomm){ if(smpi_privatize_global_variables){ //we need to switch as the called function may silently touch global variables smpi_switch_data_segment(smpi_process_index()); } - MPI_Group cp = new simgrid::smpi::Group(this->group()); - (*newcomm) = new simgrid::smpi::Comm(cp, this->topo()); + MPI_Group cp = new Group(this->group()); + (*newcomm) = new Comm(cp, this->topo()); int ret = MPI_SUCCESS; - if(attributes_ !=nullptr){ - (*newcomm)->attributes_ = xbt_dict_new_homogeneous(nullptr); - xbt_dict_cursor_t cursor = nullptr; - char* key; + if(!attributes_.empty()){ int flag; - void* value_in; void* value_out; - xbt_dict_foreach (attributes_, cursor, key, value_in) { - smpi_comm_key_elem elem = - static_cast(xbt_dict_get_or_null_ext(smpi_comm_keyvals, key, sizeof(int))); - if (elem != nullptr && elem->copy_fn != MPI_NULL_COPY_FN) { - ret = elem->copy_fn(this, atoi(key), nullptr, value_in, &value_out, &flag); + for(auto it = attributes_.begin(); it != attributes_.end(); it++){ + 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) { - (*newcomm)->destroy(); + Comm::destroy(*newcomm); *newcomm = MPI_COMM_NULL; - xbt_dict_cursor_free(&cursor); return ret; } - if (flag) - xbt_dict_set_ext((*newcomm)->attributes_, key, sizeof(int), value_out, nullptr); + if (flag){ + elem->refcount++; + (*newcomm)->attributes_.insert({(*it).first, value_out}); + } } } } @@ -220,7 +210,7 @@ MPI_Comm Comm::split(int color, int key) } else { recvbuf = nullptr; } - smpi_mpi_gather(sendbuf, 2, MPI_INT, recvbuf, 2, MPI_INT, 0, this); + Coll_gather_default::gather(sendbuf, 2, MPI_INT, recvbuf, 2, MPI_INT, 0, this); xbt_free(sendbuf); /* Do the actual job */ if(rank == 0) { @@ -243,7 +233,7 @@ MPI_Comm Comm::split(int color, int key) rankmap[2 * count + 1] = recvbuf[2 * i + 1]; count++; qsort(rankmap, count, 2 * sizeof(int), &smpi_compare_rankmap); - group_out = new simgrid::smpi::Group(count); + group_out = new Group(count); if (i == 0) { group_root = group_out; /* Save root's group */ } @@ -255,15 +245,16 @@ MPI_Comm Comm::split(int color, int key) int reqs = 0; for (int j = 0; j < count; j++) { if(rankmap[2 * j] != 0) { - group_snd[reqs]=new simgrid::smpi::Group(group_out); - requests[reqs] = smpi_mpi_isend(&(group_snd[reqs]), 1, MPI_PTR, rankmap[2 * j], system_tag, this); + group_snd[reqs]=new Group(group_out); + requests[reqs] = Request::isend(&(group_snd[reqs]), 1, MPI_PTR, rankmap[2 * j], system_tag, this); reqs++; } } if(i != 0) { - group_out->destroy(); + if(group_out != MPI_COMM_WORLD->group() && group_out != MPI_GROUP_EMPTY) + Group::unref(group_out); } - smpi_mpi_waitall(reqs, requests, MPI_STATUS_IGNORE); + Request::waitall(reqs, requests, MPI_STATUS_IGNORE); xbt_free(requests); } } @@ -273,59 +264,44 @@ MPI_Comm Comm::split(int color, int key) group_out = group_root; /* exit with root's group */ } else { if(color != MPI_UNDEFINED) { - smpi_mpi_recv(&group_out, 1, MPI_PTR, 0, system_tag, this, MPI_STATUS_IGNORE); + 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 simgrid::smpi::Comm(group_out, nullptr) : MPI_COMM_NULL; + return group_out!=nullptr ? new Comm(group_out, nullptr) : MPI_COMM_NULL; } -void Comm::use(){ +void Comm::ref(){ if (this == MPI_COMM_UNINITIALIZED){ - smpi_process_comm_world()->use(); + smpi_process_comm_world()->ref(); return; } - group_->use(); + group_->ref(); refcount_++; } -void Comm::cleanup_attributes(){ - if(attributes_ !=nullptr){ - xbt_dict_cursor_t cursor = nullptr; - char* key; - void* value; - int flag; - xbt_dict_foreach (attributes_, cursor, key, value) { - smpi_comm_key_elem elem = static_cast(xbt_dict_get_or_null(smpi_comm_keyvals, key)); - if (elem != nullptr && elem->delete_fn != nullptr) - elem->delete_fn(this, atoi(key), value, &flag); - } - xbt_dict_free(&attributes_); - } -} - void Comm::cleanup_smp(){ if (intra_comm_ != MPI_COMM_NULL) - intra_comm_->unuse(); + Comm::unref(intra_comm_); if (leaders_comm_ != MPI_COMM_NULL) - leaders_comm_->unuse(); + Comm::unref(leaders_comm_); if (non_uniform_map_ != nullptr) xbt_free(non_uniform_map_); if (leaders_map_ != nullptr) xbt_free(leaders_map_); } -void Comm::unuse(){ - if (this == MPI_COMM_UNINITIALIZED){ - smpi_process_comm_world()->unuse(); +void Comm::unref(Comm* comm){ + if (comm == MPI_COMM_UNINITIALIZED){ + Comm::unref(smpi_process_comm_world()); return; } - refcount_--; - group_->unuse(); + comm->refcount_--; + Group::unref(comm->group_); - if(refcount_==0){ - this->cleanup_smp(); - this->cleanup_attributes(); - delete this; + if(comm->refcount_==0){ + comm->cleanup_smp(); + comm->cleanup_attr(); + delete comm; } } @@ -358,35 +334,33 @@ void Comm::init_smp(){ } //identify neighbours in comm //get the indexes of all processes sharing the same simix host - xbt_swag_t process_list = SIMIX_host_self()->processes(); - int intra_comm_size = 0; - int i =0; - int min_index=INT_MAX;//the minimum index will be the leader - smx_actor_t process = nullptr; - xbt_swag_foreach(process, process_list) { - int index = process->pid -1; + xbt_swag_t process_list = SIMIX_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){ - intra_comm_size++; + intra_comm_size++; //the process is in the comm if(index < min_index) min_index=index; - i++; } } XBT_DEBUG("number of processes deployed on my node : %d", intra_comm_size); - MPI_Group group_intra = new simgrid::smpi::Group(intra_comm_size); - i=0; - process = nullptr; - xbt_swag_foreach(process, process_list) { - int index = process->pid -1; + 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); i++; } } - MPI_Comm comm_intra = new simgrid::smpi::Comm(group_intra, nullptr); + MPI_Comm comm_intra = new Comm(group_intra, nullptr); leader=min_index; int * leaders_map= static_cast(xbt_malloc0(sizeof(int)*comm_size)); @@ -395,7 +369,7 @@ void Comm::init_smp(){ leader_list[i]=-1; } - smpi_coll_tuned_allgather_mpich(&leader, 1, MPI_INT , leaders_map, 1, MPI_INT, this); + Coll_allgather_mpich::allgather(&leader, 1, MPI_INT , leaders_map, 1, MPI_INT, this); if(smpi_privatize_global_variables){ //we need to switch as the called function may silently touch global variables smpi_switch_data_segment(smpi_process_index()); @@ -422,14 +396,14 @@ void Comm::init_smp(){ } qsort(leader_list, leader_group_size, sizeof(int),compare_ints); - MPI_Group leaders_group = new simgrid::smpi::Group(leader_group_size); + MPI_Group 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(leader_list[i], i); - leader_comm = new simgrid::smpi::Comm(leaders_group, nullptr); + leader_comm = new Comm(leaders_group, nullptr); this->set_leaders_comm(leader_comm); this->set_intra_comm(comm_intra); @@ -439,11 +413,11 @@ void Comm::init_smp(){ leaders_group->set_mapping(leader_list[i], i); if(this->get_leaders_comm()==MPI_COMM_NULL){ - leader_comm = new simgrid::smpi::Comm(leaders_group, nullptr); + leader_comm = new Comm(leaders_group, nullptr); this->set_leaders_comm(leader_comm); }else{ leader_comm=this->get_leaders_comm(); - leaders_group->unuse(); + Group::unref(leaders_group); } smpi_process_set_comm_intra(comm_intra); } @@ -454,7 +428,7 @@ void Comm::init_smp(){ int my_local_size=comm_intra->size(); if(comm_intra->rank()==0) { int* non_uniform_map = xbt_new0(int,leader_group_size); - smpi_coll_tuned_allgather_mpich(&my_local_size, 1, MPI_INT, + Coll_allgather_mpich::allgather(&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]) { @@ -469,7 +443,7 @@ void Comm::init_smp(){ } is_uniform_=is_uniform; } - smpi_coll_tuned_bcast_mpich(&(is_uniform_),1, MPI_INT, 0, comm_intra ); + Coll_bcast_mpich::bcast(&(is_uniform_),1, MPI_INT, 0, comm_intra ); if(smpi_privatize_global_variables){ //we need to switch as the called function may silently touch global variables smpi_switch_data_segment(smpi_process_index()); @@ -487,7 +461,7 @@ void Comm::init_smp(){ } int global_blocked; - smpi_mpi_allreduce(&is_blocked, &(global_blocked), 1, MPI_INT, MPI_LAND, this); + Coll_allreduce_default::allreduce(&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){ @@ -502,94 +476,37 @@ void Comm::init_smp(){ smpi_process_set_replaying(true); } -int Comm::attr_delete(int keyval){ - smpi_comm_key_elem elem = - static_cast(xbt_dict_get_or_null_ext(smpi_comm_keyvals, reinterpret_cast(&keyval), sizeof(int))); - if(elem==nullptr) - return MPI_ERR_ARG; - if(elem->delete_fn!=MPI_NULL_DELETE_FN){ - void* value = nullptr; - int flag; - if(this->attr_get(keyval, &value, &flag)==MPI_SUCCESS){ - int ret = elem->delete_fn(this, keyval, value, &flag); - if(ret!=MPI_SUCCESS) - return ret; - } +MPI_Comm Comm::f2c(int id) { + if(id == -2) { + return MPI_COMM_SELF; + } else if(id==0){ + return MPI_COMM_WORLD; + } else if(F2C::f2c_lookup_ != nullptr && id >= 0) { + char key[KEY_SIZE]; + MPI_Comm tmp = static_cast(xbt_dict_get_or_null(F2C::f2c_lookup_,get_key_id(key, id))); + return tmp != nullptr ? tmp : MPI_COMM_NULL ; + } else { + return MPI_COMM_NULL; } - if(attributes_==nullptr) - return MPI_ERR_ARG; - - xbt_dict_remove_ext(attributes_, reinterpret_cast(&keyval), sizeof(int)); - return MPI_SUCCESS; } -int Comm::attr_get(int keyval, void* attr_value, int* flag){ - smpi_comm_key_elem elem = - static_cast(xbt_dict_get_or_null_ext(smpi_comm_keyvals, reinterpret_cast(&keyval), sizeof(int))); - if(elem==nullptr) - return MPI_ERR_ARG; - if(attributes_==nullptr){ - *flag=0; - return MPI_SUCCESS; - } - try { - *static_cast(attr_value) = - xbt_dict_get_ext(attributes_, reinterpret_cast(&keyval), sizeof(int)); - *flag=1; - } - catch (xbt_ex& ex) { - *flag=0; - } - return MPI_SUCCESS; +void Comm::free_f(int id) { + char key[KEY_SIZE]; + xbt_dict_remove(F2C::f2c_lookup_, id==0? get_key(key, id) : get_key_id(key, id)); } -int Comm::attr_put(int keyval, void* attr_value){ - if(smpi_comm_keyvals==nullptr) - smpi_comm_keyvals = xbt_dict_new_homogeneous(nullptr); - smpi_comm_key_elem elem = - static_cast(xbt_dict_get_or_null_ext(smpi_comm_keyvals, reinterpret_cast(&keyval), sizeof(int))); - if(elem==nullptr) - return MPI_ERR_ARG; - int flag; - void* value = nullptr; - this->attr_get(keyval, &value, &flag); - if(flag!=0 && elem->delete_fn!=MPI_NULL_DELETE_FN){ - int ret = elem->delete_fn(this, keyval, value, &flag); - if(ret!=MPI_SUCCESS) - return ret; +int Comm::add_f() { + if(F2C::f2c_lookup_==nullptr){ + F2C::f2c_lookup_=xbt_dict_new_homogeneous(nullptr); } - if(attributes_==nullptr) - attributes_ = xbt_dict_new_homogeneous(nullptr); - - xbt_dict_set_ext(attributes_, reinterpret_cast(&keyval), sizeof(int), attr_value, nullptr); - return MPI_SUCCESS; + char key[KEY_SIZE]; + xbt_dict_set(F2C::f2c_lookup_, this==MPI_COMM_WORLD? get_key(key, F2C::f2c_id_) : get_key_id(key,F2C::f2c_id_), this, nullptr); + F2C::f2c_id_++; + return F2C::f2c_id_-1; } + } } -int smpi_comm_keyval_create(MPI_Comm_copy_attr_function* copy_fn, MPI_Comm_delete_attr_function* delete_fn, int* keyval, - void* extra_state){ - if(smpi_comm_keyvals==nullptr) - smpi_comm_keyvals = xbt_dict_new_homogeneous(nullptr); - - smpi_comm_key_elem value = static_cast(xbt_new0(s_smpi_mpi_comm_key_elem_t,1)); - - value->copy_fn=copy_fn; - value->delete_fn=delete_fn; - *keyval = comm_keyval_id; - xbt_dict_set_ext(smpi_comm_keyvals, reinterpret_cast(keyval), sizeof(int),static_cast(value), nullptr); - comm_keyval_id++; - return MPI_SUCCESS; -} - -int smpi_comm_keyval_free(int* keyval){ - smpi_comm_key_elem elem = - static_cast(xbt_dict_get_or_null_ext(smpi_comm_keyvals, reinterpret_cast(keyval), sizeof(int))); - if(elem==nullptr) - return MPI_ERR_ARG; - xbt_dict_remove_ext(smpi_comm_keyvals, reinterpret_cast(keyval), sizeof(int)); - xbt_free(elem); - return MPI_SUCCESS; -}