#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"
std::vector<s_smpi_factor_t> smpi_ois_values;
-extern void (*smpi_comm_copy_data_callback)(simgrid::kernel::activity::CommImpl*, void*, size_t);
+extern std::function<void(simgrid::kernel::activity::CommImpl*, void*, size_t)> smpi_comm_copy_data_callback;
namespace simgrid{
namespace smpi{
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;
std::array<MPI_Request, 2> requests;
std::array<MPI_Status, 2> 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;
: smpi_comm_copy_data_callback,
this,
-1.0};
+ observer.set_tag(tag_);
- action_ = kernel::actor::simcall(
- [&observer] {
- return kernel::activity::CommImpl::irecv(
- observer.get_issuer(), observer.get_mailbox(), observer.get_dst_buff(), observer.get_dst_buff_size(),
- observer.match_fun_, observer.copy_data_fun_, observer.get_payload(), observer.get_rate());
- },
- &observer);
+ action_ = kernel::actor::simcall_answered([&observer] { return kernel::activity::CommImpl::irecv(&observer); },
+ &observer);
XBT_DEBUG("recv simcall posted");
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<void*>(this));
- if (action == nullptr) {
+ if (not mailbox->iprobe(1, &match_send, static_cast<void*>(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",
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<void*>(this));
- if (action == nullptr) {
+ if (not mailbox->iprobe(1, &match_send, static_cast<void*>(this))) {
XBT_DEBUG("No, we are first, send to large mailbox");
mailbox = process->mailbox();
}
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<double>(payload_size_), -1,
- static_cast<unsigned char*>(buf), real_size_, &match_send,
+ simgrid::kernel::EngineImpl::get_instance()->get_actor_by_pid(src_), mailbox->get_impl(),
+ static_cast<double>(payload_size_), -1, static_cast<unsigned char*>(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_};
- action_ = kernel::actor::simcall(
- [&observer] {
- return kernel::activity::CommImpl::isend(
- observer.get_issuer(), observer.get_mailbox(), observer.get_payload_size(), observer.get_rate(),
- observer.get_src_buff(), observer.get_src_buff_size(), observer.match_fun_, observer.clean_fun_,
- observer.copy_data_fun_, observer.get_payload(), observer.is_detached());
- },
- &observer);
+ observer.set_tag(tag_);
+ 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) */
try{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
kernel::actor::ActivityTestSimcall observer{issuer, (*request)->action_.get()};
- *flag = kernel::actor::simcall_blocking([&observer] { 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;
*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;
try{
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
kernel::actor::ActivityTestanySimcall observer{issuer, comms};
- i = kernel::actor::simcall_blocking(
- [&observer] { kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities()); },
+ i = kernel::actor::simcall_answered(
+ [&observer] {
+ return kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities());
+ },
&observer);
} catch (const Exception&) {
XBT_DEBUG("Exception in testany");
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<simgrid::smpi::Host>()->orecv(
- req->real_size(), req->src_host_, dst_host);
- if (sleeptime > 0.0) {
+ if (double sleeptime = simgrid::s4u::Actor::self()->get_host()->extension<simgrid::smpi::Host>()->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);
}
// 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");
}
