X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b3ef52aafb46cf06757353f5a85f3aa2f5c38a2..3e8cbdbebfce89fb0abf0cb8710c8505e111d097:/src/smpi/mpi/smpi_request.cpp diff --git a/src/smpi/mpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp index 77885e4bc6..fd1a79cbae 100644 --- a/src/smpi/mpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -15,6 +15,7 @@ #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" @@ -31,12 +32,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; -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 +58,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 +116,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 +148,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 @@ -424,8 +420,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; @@ -508,7 +503,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(), @@ -592,8 +587,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", @@ -602,8 +596,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(); } @@ -611,7 +604,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(); @@ -620,8 +613,8 @@ 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 @@ -729,8 +722,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; @@ -1029,9 +1021,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); } @@ -1092,9 +1084,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"); } @@ -1297,8 +1288,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) @@ -1360,5 +1349,4 @@ std::vector Request::get_nbc_requests() const { return nbc_requests_; } -} -} +} // namespace simgrid::smpi