X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7013392b1a0a3aed2219fa352e81826f8657fbe2..101c8b10d9965e115c9ff5c28954750a065cf155:/src/smpi/mpi/smpi_win.cpp diff --git a/src/smpi/mpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp index 86059ca339..9efd47911d 100644 --- a/src/smpi/mpi/smpi_win.cpp +++ b/src/smpi/mpi/smpi_win.cpp @@ -16,7 +16,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_rma, smpi, "Logging specific to SMPI (RMA operations)"); -using simgrid::s4u::Actor; namespace simgrid{ namespace smpi{ @@ -40,19 +39,19 @@ Win::Win(void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, connected_wins_[rank_] = this; count_ = 0; if(rank_==0){ - bar_ = new simgrid::s4u::Barrier(comm_size); + bar_ = new s4u::Barrier(comm_size); } mode_=0; - + errhandler_=MPI_ERRORS_ARE_FATAL; 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(simgrid::s4u::Barrier*), MPI_BYTE, 0, comm); + colls::bcast(&(bar_), sizeof(s4u::Barrier*), MPI_BYTE, 0, comm); - Colls::barrier(comm); + colls::barrier(comm); } Win::~Win(){ @@ -73,7 +72,7 @@ Win::~Win(){ comm_->remove_rma_win(this); - Colls::barrier(comm_); + colls::barrier(comm_); Comm::unref(comm_); if (rank_ == 0) @@ -85,7 +84,8 @@ Win::~Win(){ cleanup_attr(); } -int Win::attach (void *base, MPI_Aint size){ +int Win::attach(void* /*base*/, MPI_Aint size) +{ if (not(base_ == MPI_BOTTOM || base_ == 0)) return MPI_ERR_ARG; base_=0;//actually the address will be given in the RMA calls, as being the disp. @@ -93,7 +93,8 @@ int Win::attach (void *base, MPI_Aint size){ return MPI_SUCCESS; } -int Win::detach (void *base){ +int Win::detach(const void* /*base*/) +{ base_=MPI_BOTTOM; size_=-1; return MPI_SUCCESS; @@ -150,7 +151,7 @@ void Win::set_info(MPI_Info info){ info_=info; } -void Win::set_name(char* name){ +void Win::set_name(const char* name){ name_ = xbt_strdup(name); } @@ -164,7 +165,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_; @@ -188,7 +189,7 @@ int Win::fence(int assert) return MPI_SUCCESS; } -int Win::put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, +int Win::put(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_Request* request) { //get receiver pointer @@ -238,8 +239,7 @@ int Win::put( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, 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) @@ -299,18 +299,15 @@ 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( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, int target_rank, +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"); @@ -333,8 +330,9 @@ int Win::accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da void* recv_addr = static_cast(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); @@ -365,10 +363,10 @@ int Win::accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_da return MPI_SUCCESS; } -int Win::get_accumulate( void *origin_addr, int origin_count, MPI_Datatype origin_datatype, void *result_addr, - int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPI_Request* request){ - +int Win::get_accumulate(const void* origin_addr, int origin_count, MPI_Datatype origin_datatype, void* result_addr, + int result_count, MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPI_Op op, MPI_Request*) +{ //get sender pointer MPI_Win send_win = connected_wins_[target_rank]; @@ -400,10 +398,9 @@ int Win::get_accumulate( void *origin_addr, int origin_count, MPI_Datatype origi Request::wait(&req, MPI_STATUS_IGNORE); send_win->atomic_mut_->unlock(); return MPI_SUCCESS; - } -int Win::compare_and_swap(void *origin_addr, void *compare_addr, +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){ //get sender pointer @@ -434,7 +431,8 @@ int Win::compare_and_swap(void *origin_addr, void *compare_addr, return MPI_SUCCESS; } -int Win::start(MPI_Group group, int assert){ +int Win::start(MPI_Group group, int /*assert*/) +{ /* From MPI forum advices The call to MPI_WIN_COMPLETE does not return until the put call has completed at the origin; and the target window will be accessed by the put operation only after the call to MPI_WIN_START has matched a call to MPI_WIN_POST by @@ -476,7 +474,8 @@ int Win::start(MPI_Group group, int assert){ return MPI_SUCCESS; } -int Win::post(MPI_Group group, int assert){ +int Win::post(MPI_Group group, int /*assert*/) +{ //let's make a synchronous send here int i = 0; int j = 0; @@ -575,7 +574,8 @@ int Win::wait(){ return MPI_SUCCESS; } -int Win::lock(int lock_type, int rank, int assert){ +int Win::lock(int lock_type, int rank, int /*assert*/) +{ MPI_Win target_win = connected_wins_[rank]; if ((lock_type == MPI_LOCK_EXCLUSIVE && target_win->mode_ != MPI_LOCK_SHARED)|| target_win->mode_ == MPI_LOCK_EXCLUSIVE){ @@ -733,5 +733,17 @@ int Win::shared_query(int rank, MPI_Aint* size, int* disp_unit, void* baseptr) } return MPI_SUCCESS; } + +MPI_Errhandler Win::errhandler() +{ + return errhandler_; } + +void Win::set_errhandler(MPI_Errhandler errhandler) +{ + errhandler_ = errhandler; + if (errhandler_ != MPI_ERRHANDLER_NULL) + errhandler->ref(); } +} // namespace smpi +} // namespace simgrid