X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..8fb33d38a40ca0d377aa543a401d34309514e542:/src/smpi/mpi/smpi_win.cpp diff --git a/src/smpi/mpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp index 953584f621..806b363d87 100644 --- a/src/smpi/mpi/smpi_win.cpp +++ b/src/smpi/mpi/smpi_win.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-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. */ @@ -22,12 +22,20 @@ namespace smpi{ std::unordered_map Win::keyvals_; int Win::keyval_id_=0; -Win::Win(void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, int allocated, int dynamic): base_(base), size_(size), disp_unit_(disp_unit), assert_(0), info_(info), comm_(comm), allocated_(allocated), dynamic_(dynamic){ - int comm_size = comm->size(); - rank_ = comm->rank(); +Win::Win(void* base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, int allocated, int dynamic) + : base_(base) + , size_(size) + , disp_unit_(disp_unit) + , info_(info) + , comm_(comm) + , rank_(comm->rank()) + , allocated_(allocated) + , dynamic_(dynamic) +{ XBT_DEBUG("Creating window"); if(info!=MPI_INFO_NULL) info->ref(); + int comm_size = comm->size(); name_ = nullptr; opened_ = 0; group_ = MPI_GROUP_NULL; @@ -43,15 +51,16 @@ Win::Win(void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, } mode_=0; errhandler_=MPI_ERRORS_ARE_FATAL; + errhandler_->ref(); comm->add_rma_win(this); comm->ref(); - Colls::allgather(&(connected_wins_[rank_]), sizeof(MPI_Win), MPI_BYTE, connected_wins_, sizeof(MPI_Win), - MPI_BYTE, comm); + colls::allgather(&(connected_wins_[rank_]), sizeof(MPI_Win), MPI_BYTE, connected_wins_, sizeof(MPI_Win), MPI_BYTE, + comm); - Colls::bcast(&(bar_), sizeof(s4u::Barrier*), MPI_BYTE, 0, comm); + colls::bcast(&(bar_), sizeof(s4u::Barrier*), MPI_BYTE, 0, comm); - Colls::barrier(comm); + colls::barrier(comm); } Win::~Win(){ @@ -66,13 +75,14 @@ Win::~Win(){ if (name_ != nullptr){ xbt_free(name_); } - if(info_!=MPI_INFO_NULL){ - MPI_Info_free(&info_); - } + if (info_ != MPI_INFO_NULL) + simgrid::smpi::Info::unref(info_); + if (errhandler_ != MPI_ERRHANDLER_NULL) + simgrid::smpi::Errhandler::unref(errhandler_); comm_->remove_rma_win(this); - Colls::barrier(comm_); + colls::barrier(comm_); Comm::unref(comm_); if (rank_ == 0) @@ -86,9 +96,9 @@ Win::~Win(){ int Win::attach(void* /*base*/, MPI_Aint size) { - if (not(base_ == MPI_BOTTOM || base_ == 0)) + if (not(base_ == MPI_BOTTOM || base_ == nullptr)) return MPI_ERR_ARG; - base_=0;//actually the address will be given in the RMA calls, as being the disp. + base_ = nullptr; // actually the address will be given in the RMA calls, as being the disp. size_+=size; return MPI_SUCCESS; } @@ -100,7 +110,8 @@ int Win::detach(const void* /*base*/) return MPI_SUCCESS; } -void Win::get_name(char* name, int* length){ +void Win::get_name(char* name, int* length) const +{ if(name_==nullptr){ *length=0; name=nullptr; @@ -118,37 +129,46 @@ void Win::get_group(MPI_Group* group){ } } -MPI_Info Win::info(){ - if(info_== MPI_INFO_NULL) +MPI_Info Win::info() +{ + if (info_ == MPI_INFO_NULL) info_ = new Info(); info_->ref(); return info_; } -int Win::rank(){ +int Win::rank() const +{ return rank_; } -MPI_Aint Win::size(){ +MPI_Aint Win::size() const +{ return size_; } -void* Win::base(){ +void* Win::base() const +{ return base_; } -int Win::disp_unit(){ +int Win::disp_unit() const +{ return disp_unit_; } -int Win::dynamic(){ +int Win::dynamic() const +{ return dynamic_; } -void Win::set_info(MPI_Info info){ - if(info_!= MPI_INFO_NULL) - info->ref(); - info_=info; +void Win::set_info(MPI_Info info) +{ + if (info_ != MPI_INFO_NULL) + simgrid::smpi::Info::unref(info_); + info_ = info; + if (info_ != MPI_INFO_NULL) + info_->ref(); } void Win::set_name(const char* name){ @@ -165,7 +185,7 @@ int Win::fence(int assert) bar_->wait(); mut_->lock(); // This (simulated) mutex ensures that no process pushes to the vector of requests during the waitall. - // Without this, the vector could get redimensionned when another process pushes. + // Without this, the vector could get redimensioned when another process pushes. // This would result in the array used by Request::waitall() to be invalidated. // Another solution would be to copy the data and cleanup the vector *before* Request::waitall std::vector *reqs = requests_; @@ -193,7 +213,7 @@ int Win::put(const void *origin_addr, int origin_count, MPI_Datatype origin_data MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Request* request) { //get receiver pointer - MPI_Win recv_win = connected_wins_[target_rank]; + const Win* recv_win = connected_wins_[target_rank]; if(opened_==0){//check that post/start has been done // no fence or start .. lock ok ? @@ -208,7 +228,7 @@ int Win::put(const void *origin_addr, int origin_count, MPI_Datatype origin_data if(target_count*target_datatype->get_extent()>recv_win->size_) return MPI_ERR_ARG; - void* recv_addr = static_cast ( static_cast(recv_win->base_) + target_disp * recv_win->disp_unit_); + void* recv_addr = static_cast(recv_win->base_) + target_disp * recv_win->disp_unit_; if (target_rank != comm_->rank()) { // This is not for myself, so we need to send messages XBT_DEBUG("Entering MPI_Put to remote rank %d", target_rank); @@ -239,8 +259,7 @@ int Win::put(const void *origin_addr, int origin_count, MPI_Datatype origin_data recv_win->requests_->push_back(rreq); rreq->start(); recv_win->mut_->unlock(); - - }else{ + } else { XBT_DEBUG("Entering MPI_Put from myself to myself, rank %d", target_rank); Datatype::copy(origin_addr, origin_count, origin_datatype, recv_addr, target_count, target_datatype); if(request!=nullptr) @@ -254,7 +273,7 @@ int Win::get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Request* request) { //get sender pointer - MPI_Win send_win = connected_wins_[target_rank]; + const Win* send_win = connected_wins_[target_rank]; if(opened_==0){//check that post/start has been done // no fence or start .. lock ok ? @@ -269,7 +288,7 @@ int Win::get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, if(target_count*target_datatype->get_extent()>send_win->size_) return MPI_ERR_ARG; - void* send_addr = static_cast(static_cast(send_win->base_) + target_disp * send_win->disp_unit_); + const void* send_addr = static_cast(static_cast(send_win->base_) + target_disp * send_win->disp_unit_); XBT_DEBUG("Entering MPI_Get from %d", target_rank); if(target_rank != comm_->rank()){ @@ -300,23 +319,20 @@ int Win::get( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, requests_->push_back(rreq); mut_->unlock(); } - - }else{ + } else { Datatype::copy(send_addr, target_count, target_datatype, origin_addr, origin_count, origin_datatype); if(request!=nullptr) *request=MPI_REQUEST_NULL; } - return MPI_SUCCESS; } - int Win::accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Request* request) { XBT_DEBUG("Entering MPI_Win_Accumulate"); //get receiver pointer - MPI_Win recv_win = connected_wins_[target_rank]; + const Win* recv_win = connected_wins_[target_rank]; if(opened_==0){//check that post/start has been done // no fence or start .. lock ok ? @@ -332,10 +348,11 @@ int Win::accumulate(const void *origin_addr, int origin_count, MPI_Datatype orig if(target_count*target_datatype->get_extent()>recv_win->size_) return MPI_ERR_ARG; - void* recv_addr = static_cast(static_cast(recv_win->base_) + target_disp * recv_win->disp_unit_); + void* recv_addr = static_cast(recv_win->base_) + target_disp * recv_win->disp_unit_; XBT_DEBUG("Entering MPI_Accumulate to %d", target_rank); - //As the tag will be used for ordering of the operations, substract count from it (to avoid collisions with other SMPI tags, SMPI_RMA_TAG is set below all the other ones we use ) - //prepare send_request + // As the tag will be used for ordering of the operations, subtract count from it (to avoid collisions with other + // SMPI tags, SMPI_RMA_TAG is set below all the other ones we use) + // prepare send_request MPI_Request sreq = Request::rma_send_init(origin_addr, origin_count, origin_datatype, comm_->rank(), target_rank, SMPI_RMA_TAG - 3 - count_, comm_, op); @@ -371,7 +388,7 @@ int Win::get_accumulate(const void* origin_addr, int origin_count, MPI_Datatype int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Request*) { //get sender pointer - MPI_Win send_win = connected_wins_[target_rank]; + const Win* send_win = connected_wins_[target_rank]; if(opened_==0){//check that post/start has been done // no fence or start .. lock ok ? @@ -401,14 +418,13 @@ int Win::get_accumulate(const void* origin_addr, int origin_count, MPI_Datatype Request::wait(&req, MPI_STATUS_IGNORE); send_win->atomic_mut_->unlock(); return MPI_SUCCESS; - } -int Win::compare_and_swap(const void *origin_addr, void *compare_addr, - void *result_addr, MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp){ +int Win::compare_and_swap(const void* origin_addr, const void* compare_addr, void* result_addr, MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp) +{ //get sender pointer - MPI_Win send_win = connected_wins_[target_rank]; + const Win* send_win = connected_wins_[target_rank]; if(opened_==0){//check that post/start has been done // no fence or start .. lock ok ? @@ -601,12 +617,11 @@ int Win::lock(int lock_type, int rank, int /*assert*/) } int Win::lock_all(int assert){ - int i=0; int retval = MPI_SUCCESS; - for (i=0; isize();i++){ - int ret = this->lock(MPI_LOCK_SHARED, i, assert); - if(ret != MPI_SUCCESS) - retval = ret; + for (int i = 0; i < comm_->size(); i++) { + int ret = this->lock(MPI_LOCK_SHARED, i, assert); + if (ret != MPI_SUCCESS) + retval = ret; } return retval; } @@ -628,9 +643,8 @@ int Win::unlock(int rank){ } int Win::unlock_all(){ - int i=0; int retval = MPI_SUCCESS; - for (i=0; isize();i++){ + for (int i = 0; i < comm_->size(); i++) { int ret = this->unlock(i); if (ret != MPI_SUCCESS) retval = ret; @@ -695,7 +709,7 @@ int Win::finish_comms(int rank){ if (size > 0) { size = 0; std::vector myreqqs; - std::vector::iterator iter = reqqs->begin(); + auto iter = reqqs->begin(); int proc_id = comm_->group()->actor(rank)->get_pid(); while (iter != reqqs->end()){ // Let's see if we're either the destination or the sender of this request @@ -720,9 +734,9 @@ int Win::finish_comms(int rank){ return size; } -int Win::shared_query(int rank, MPI_Aint* size, int* disp_unit, void* baseptr) +int Win::shared_query(int rank, MPI_Aint* size, int* disp_unit, void* baseptr) const { - MPI_Win target_win = rank != MPI_PROC_NULL ? connected_wins_[rank] : nullptr; + const Win* target_win = rank != MPI_PROC_NULL ? connected_wins_[rank] : nullptr; for (int i = 0; not target_win && i < comm_->size(); i++) { if (connected_wins_[i]->size_ > 0) target_win = connected_wins_[i]; @@ -733,20 +747,25 @@ int Win::shared_query(int rank, MPI_Aint* size, int* disp_unit, void* baseptr) *static_cast(baseptr) = target_win->base_; } else { *size = 0; - *static_cast(baseptr) = xbt_malloc(0); + *static_cast(baseptr) = nullptr; } return MPI_SUCCESS; } -MPI_Errhandler Win::errhandler(){ +MPI_Errhandler Win::errhandler() +{ + if (errhandler_ != MPI_ERRHANDLER_NULL) + errhandler_->ref(); return errhandler_; } -void Win::set_errhandler(MPI_Errhandler errhandler){ - errhandler_=errhandler; - if(errhandler_!= MPI_ERRHANDLER_NULL) - errhandler->ref(); -} - -} -} +void Win::set_errhandler(MPI_Errhandler errhandler) +{ + if (errhandler_ != MPI_ERRHANDLER_NULL) + simgrid::smpi::Errhandler::unref(errhandler_); + errhandler_ = errhandler; + if (errhandler_ != MPI_ERRHANDLER_NULL) + errhandler_->ref(); +} +} // namespace smpi +} // namespace simgrid