X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/964924f05516c25accb7be21f22a5aa022a4e985..e9b99cc75875aaffe31d627aceb45a3583770d55:/src/smpi/mpi/smpi_request.cpp diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp index e8ab078064..893969583e 100644 --- a/src/smpi/mpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -1,11 +1,10 @@ -/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2023. 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_request.hpp" -#include "mc/mc.h" #include "private.hpp" #include "simgrid/Exception.hpp" #include "simgrid/s4u/ConditionVariable.hpp" @@ -15,14 +14,17 @@ #include "smpi_datatype.hpp" #include "smpi_host.hpp" #include "smpi_op.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/actor/ActorImpl.hpp" #include "src/kernel/actor/SimcallObserver.hpp" +#include "src/mc/mc.h" #include "src/mc/mc_replay.hpp" #include "src/smpi/include/smpi_actor.hpp" #include #include +#include // std::scoped_lock and std::unique_lock XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_request, smpi, "Logging specific to SMPI (request)"); @@ -31,12 +33,9 @@ static simgrid::config::Flag smpi_iprobe_sleep( static simgrid::config::Flag smpi_test_sleep( "smpi/test", "Minimum time to inject inside a call to MPI_Test", 1e-4); -std::vector smpi_ois_values; +extern std::function smpi_comm_copy_data_callback; -extern void (*smpi_comm_copy_data_callback)(simgrid::kernel::activity::CommImpl*, void*, size_t); - -namespace simgrid{ -namespace smpi{ +namespace simgrid::smpi { Request::Request(const void* buf, int count, MPI_Datatype datatype, aid_t src, aid_t dst, int tag, MPI_Comm comm, unsigned flags, MPI_Op op) @@ -60,8 +59,7 @@ Request::Request(const void* buf, int count, MPI_Datatype datatype, aid_t src, a detached_sender_ = nullptr; real_src_ = 0; // get src_host if it's available (src is valid) - auto src_process = simgrid::s4u::Actor::by_pid(src); - if (src_process) + if (auto src_process = simgrid::s4u::Actor::by_pid(src)) src_host_ = src_process->get_host(); truncated_ = false; unmatched_types_ = false; @@ -119,7 +117,7 @@ bool Request::match_types(MPI_Datatype stype, MPI_Datatype rtype){ (stype->duplicated_datatype()!=MPI_DATATYPE_NULL && match_types(stype->duplicated_datatype(), rtype)) || (rtype->duplicated_datatype()!=MPI_DATATYPE_NULL && match_types(stype, rtype->duplicated_datatype()))) match = true; - if (!match) + if (not match) XBT_WARN("Mismatched datatypes : sending %s and receiving %s", stype->name().c_str(), rtype->name().c_str()); return match; } @@ -151,8 +149,7 @@ bool Request::match_common(MPI_Request req, MPI_Request sender, MPI_Request rece receiver->truncated_ = true; } //0-sized datatypes/counts should not interfere and match - if ( sender->real_size_ != 0 && receiver->real_size_ != 0 && - !match_types(sender->type_, receiver->type_)) + if (sender->real_size_ != 0 && receiver->real_size_ != 0 && not match_types(sender->type_, receiver->type_)) receiver->unmatched_types_ = true; if (sender->detached_) receiver->detached_sender_ = sender; // tie the sender to the receiver, as it is detached and has to be freed in @@ -372,7 +369,6 @@ int Request::recv(void *buf, int count, MPI_Datatype datatype, int src, int tag, { MPI_Request request = irecv(buf, count, datatype, src, tag, comm); int retval = wait(&request,status); - request = nullptr; return retval; } @@ -385,7 +381,6 @@ void Request::bsend(const void *buf, int count, MPI_Datatype datatype, int dst, if(dst != MPI_PROC_NULL) request->start(); wait(&request, MPI_STATUS_IGNORE); - request = nullptr; } void Request::send(const void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) @@ -396,7 +391,6 @@ void Request::send(const void *buf, int count, MPI_Datatype datatype, int dst, i if(dst != MPI_PROC_NULL) request->start(); wait(&request, MPI_STATUS_IGNORE); - request = nullptr; } void Request::ssend(const void *buf, int count, MPI_Datatype datatype, int dst, int tag, MPI_Comm comm) @@ -408,7 +402,6 @@ void Request::ssend(const void *buf, int count, MPI_Datatype datatype, int dst, if(dst != MPI_PROC_NULL) request->start(); wait(&request,MPI_STATUS_IGNORE); - request = nullptr; } void Request::sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype,int dst, int sendtag, @@ -424,8 +417,7 @@ void Request::sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype std::array requests; std::array stats; - aid_t myid = simgrid::s4u::this_actor::get_pid(); - if ((destination == myid) && (source == myid)) { + if (aid_t myid = simgrid::s4u::this_actor::get_pid(); (destination == myid) && (source == myid)) { Datatype::copy(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype); if (status != MPI_STATUS_IGNORE) { status->MPI_SOURCE = source; @@ -468,9 +460,9 @@ void Request::start() simgrid::smpi::ActorExt* process = smpi_process_remote(simgrid::s4u::Actor::by_pid(dst_)); - simgrid::s4u::MutexPtr mut = process->mailboxes_mutex(); + std::unique_lock mut_lock; if (smpi_cfg_async_small_thresh() != 0 || (flags_ & MPI_REQ_RMA) != 0) - mut->lock(); + mut_lock = std::unique_lock(*process->mailboxes_mutex()); bool is_probe = ((flags_ & MPI_REQ_PROBE) != 0); flags_ |= MPI_REQ_PROBE; @@ -508,7 +500,7 @@ void Request::start() XBT_DEBUG("yes there was something for us in the small mailbox"); } } - if(!is_probe) + if (not is_probe) flags_ &= ~MPI_REQ_PROBE; kernel::actor::CommIrecvSimcall observer{process->get_actor()->get_impl(), mailbox->get_impl(), @@ -521,12 +513,10 @@ void Request::start() -1.0}; observer.set_tag(tag_); - action_ = kernel::actor::simcall([&observer] { return kernel::activity::CommImpl::irecv(&observer); }, &observer); + action_ = kernel::actor::simcall_answered([&observer] { return kernel::activity::CommImpl::irecv(&observer); }, + &observer); XBT_DEBUG("recv simcall posted"); - - if (smpi_cfg_async_small_thresh() != 0 || (flags_ & MPI_REQ_RMA) != 0) - mut->unlock(); } else { /* the RECV flag was not set, so this is a send */ const simgrid::smpi::ActorExt* process = smpi_process_remote(simgrid::s4u::Actor::by_pid(dst_)); xbt_assert(process, "Actor pid=%ld is gone??", dst_); @@ -578,10 +568,9 @@ void Request::start() XBT_DEBUG("sending size of %zu : sleep %f ", size_, sleeptime); } - simgrid::s4u::MutexPtr mut = process->mailboxes_mutex(); - + std::unique_lock mut_lock; if (smpi_cfg_async_small_thresh() != 0 || (flags_ & MPI_REQ_RMA) != 0) - mut->lock(); + mut_lock = std::unique_lock(*process->mailboxes_mutex()); if (not(smpi_cfg_async_small_thresh() != 0 || (flags_ & MPI_REQ_RMA) != 0)) { mailbox = process->mailbox(); @@ -591,8 +580,7 @@ void Request::start() mailbox = process->mailbox(); XBT_DEBUG("Is there a corresponding recv already posted in the large mailbox %s?", mailbox->get_cname()); - simgrid::kernel::activity::ActivityImplPtr action = mailbox->iprobe(1, &match_send, static_cast(this)); - if (action == nullptr) { + if (not mailbox->iprobe(1, &match_send, static_cast(this))) { if ((flags_ & MPI_REQ_SSEND) == 0) { mailbox = process->mailbox_small(); XBT_DEBUG("No, nothing in the large mailbox, message is to be sent on the small one %s", @@ -601,8 +589,7 @@ void Request::start() mailbox = process->mailbox_small(); XBT_DEBUG("SSEND : Is there a corresponding recv already posted in the small mailbox %s?", mailbox->get_cname()); - action = mailbox->iprobe(1, &match_send, static_cast(this)); - if (action == nullptr) { + if (not mailbox->iprobe(1, &match_send, static_cast(this))) { XBT_DEBUG("No, we are first, send to large mailbox"); mailbox = process->mailbox(); } @@ -610,7 +597,7 @@ void Request::start() } else { XBT_DEBUG("Yes there was something for us in the large mailbox"); } - if(!is_probe) + if (not is_probe) flags_ &= ~MPI_REQ_PROBE; } else { mailbox = process->mailbox(); @@ -619,14 +606,15 @@ void Request::start() size_t payload_size_ = size_ + 16;//MPI enveloppe size (tag+dest+communicator) kernel::actor::CommIsendSimcall observer{ - simgrid::kernel::actor::ActorImpl::by_pid(src_), mailbox->get_impl(), static_cast(payload_size_), -1, - static_cast(buf), real_size_, &match_send, + simgrid::kernel::EngineImpl::get_instance()->get_actor_by_pid(src_), mailbox->get_impl(), + static_cast(payload_size_), -1, static_cast(buf), real_size_, &match_send, &xbt_free_f, // how to free the userdata if a detached send fails process->replaying() ? &smpi_comm_null_copy_buffer_callback : smpi_comm_copy_data_callback, this, // detach if msg size < eager/rdv switch limit detached_}; observer.set_tag(tag_); - action_ = kernel::actor::simcall([&observer] { return kernel::activity::CommImpl::isend(&observer); }, &observer); + action_ = kernel::actor::simcall_answered([&observer] { return kernel::activity::CommImpl::isend(&observer); }, + &observer); XBT_DEBUG("send simcall posted"); /* FIXME: detached sends are not traceable (action_ == nullptr) */ @@ -634,9 +622,6 @@ void Request::start() boost::static_pointer_cast(action_)->set_tracing_category( smpi_process()->get_tracing_category()); } - - if (smpi_cfg_async_small_thresh() != 0 || ((flags_ & MPI_REQ_RMA) != 0)) - mut->unlock(); } } @@ -684,8 +669,8 @@ int Request::test(MPI_Request * request, MPI_Status * status, int* flag) { try{ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); kernel::actor::ActivityTestSimcall observer{issuer, (*request)->action_.get()}; - *flag = kernel::actor::simcall([&observer] { return observer.get_activity()->test(observer.get_issuer()); }, - &observer); + *flag = kernel::actor::simcall_answered( + [&observer] { return observer.get_activity()->test(observer.get_issuer()); }, &observer); } catch (const Exception&) { *flag = 0; return ret; @@ -727,8 +712,7 @@ int Request::testsome(int incount, MPI_Request requests[], int *count, int *indi *count = 0; for (int i = 0; i < incount; i++) { if (requests[i] != MPI_REQUEST_NULL && not (requests[i]->flags_ & MPI_REQ_FINISHED)) { - int ret = test(&requests[i], pstat, &flag); - if(ret!=MPI_SUCCESS) + if (test(&requests[i], pstat, &flag) != MPI_SUCCESS) error = 1; if(flag) { indices[*count] = i; @@ -774,7 +758,7 @@ int Request::testany(int count, MPI_Request requests[], int *index, int* flag, M try{ kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); kernel::actor::ActivityTestanySimcall observer{issuer, comms}; - i = kernel::actor::simcall( + i = kernel::actor::simcall_answered( [&observer] { return kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities()); }, @@ -1027,9 +1011,9 @@ void Request::finish_wait(MPI_Request* request, MPI_Status * status) if(req->detached_sender_ != nullptr){ //integrate pseudo-timing for buffering of small messages, do not bother to execute the simcall if 0 simgrid::s4u::Host* dst_host = simgrid::s4u::Actor::by_pid(req->dst_)->get_host(); - double sleeptime = simgrid::s4u::Actor::self()->get_host()->extension()->orecv( - req->real_size(), req->src_host_, dst_host); - if (sleeptime > 0.0) { + if (double sleeptime = simgrid::s4u::Actor::self()->get_host()->extension()->orecv( + req->real_size(), req->src_host_, dst_host); + sleeptime > 0.0) { simgrid::s4u::this_actor::sleep_for(sleeptime); XBT_DEBUG("receiving size of %zu : sleep %f ", req->real_size_, sleeptime); } @@ -1090,9 +1074,8 @@ int Request::wait(MPI_Request * request, MPI_Status * status) // this is not a detached send kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); kernel::actor::ActivityWaitSimcall observer{issuer, (*request)->action_.get(), -1}; - kernel::actor::simcall_blocking( - [&observer] { observer.get_activity()->wait_for(observer.get_issuer(), observer.get_timeout()); }, - &observer); + kernel::actor::simcall_blocking([issuer, &observer] { observer.get_activity()->wait_for(issuer, -1); }, + &observer); } catch (const CancelException&) { XBT_VERB("Request cancelled"); } @@ -1100,9 +1083,8 @@ int Request::wait(MPI_Request * request, MPI_Status * status) if ((*request)->flags_ & MPI_REQ_GENERALIZED) { if (not((*request)->flags_ & MPI_REQ_COMPLETE)) { - ((*request)->generalized_funcs)->mutex->lock(); - ((*request)->generalized_funcs)->cond->wait(((*request)->generalized_funcs)->mutex); - ((*request)->generalized_funcs)->mutex->unlock(); + const std::scoped_lock lock(*(*request)->generalized_funcs->mutex); + (*request)->generalized_funcs->cond->wait((*request)->generalized_funcs->mutex); } MPI_Status tmp_status; MPI_Status* mystatus; @@ -1295,8 +1277,6 @@ void Request::free_f(int id) int Request::get_status(const Request* req, int* flag, MPI_Status* status) { - *flag=0; - if(req != MPI_REQUEST_NULL && req->action_ != nullptr) { req->iprobe(req->comm_->group()->rank(req->src_), req->tag_, req->comm_, flag, status); if(*flag) @@ -1340,10 +1320,9 @@ int Request::grequest_complete(MPI_Request request) { if ((not(request->flags_ & MPI_REQ_GENERALIZED)) || request->generalized_funcs->mutex == nullptr) return MPI_ERR_REQUEST; - request->generalized_funcs->mutex->lock(); + const std::scoped_lock lock(*request->generalized_funcs->mutex); request->flags_ |= MPI_REQ_COMPLETE; // in case wait would be called after complete request->generalized_funcs->cond->notify_one(); - request->generalized_funcs->mutex->unlock(); return MPI_SUCCESS; } @@ -1358,5 +1337,4 @@ std::vector Request::get_nbc_requests() const { return nbc_requests_; } -} -} +} // namespace simgrid::smpi