X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/53ab1525ab0a15ba7323171aba78be415fd64fd6..4929b7f325bed62b338613c63af15c75a185effe:/src/kernel/activity/CommImpl.cpp diff --git a/src/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp index 769c8e660c..d13a1d1e85 100644 --- a/src/kernel/activity/CommImpl.cpp +++ b/src/kernel/activity/CommImpl.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. */ @@ -20,19 +20,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related syn XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t src, smx_mailbox_t mbox, double task_size, double rate, unsigned char* src_buff, size_t src_buff_size, - int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double timeout) { - smx_activity_t comm = simcall_HANDLER_comm_isend(simcall, src, mbox, task_size, rate, src_buff, src_buff_size, - match_fun, nullptr, copy_data_fun, data, 0); + simgrid::kernel::activity::ActivityImplPtr comm = simcall_HANDLER_comm_isend( + simcall, src, mbox, task_size, rate, src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0); SIMCALL_SET_MC_VALUE(*simcall, 0); simcall_HANDLER_comm_wait(simcall, static_cast(comm.get()), timeout); } -XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( +XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isend( smx_simcall_t /*simcall*/, smx_actor_t src_proc, smx_mailbox_t mbox, double task_size, double rate, - unsigned char* src_buff, size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + unsigned char* src_buff, size_t src_buff_size, + bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), // used to copy data if not default one void* data, bool detached) @@ -77,7 +78,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( other_comm->clean_fun = clean_fun; } else { other_comm->clean_fun = nullptr; - src_proc->comms.push_back(other_comm); + src_proc->activities.push_back(other_comm); } /* Setup the communication synchro */ @@ -98,20 +99,21 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend( XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox, unsigned char* dst_buff, size_t* dst_buff_size, - int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, double timeout, double rate) { - smx_activity_t comm = simcall_HANDLER_comm_irecv(simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, - copy_data_fun, data, rate); + simgrid::kernel::activity::ActivityImplPtr comm = simcall_HANDLER_comm_irecv( + simcall, receiver, mbox, dst_buff, dst_buff_size, match_fun, copy_data_fun, data, rate); SIMCALL_SET_MC_VALUE(*simcall, 0); simcall_HANDLER_comm_wait(simcall, static_cast(comm.get()), timeout); } -XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv( - smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_mailbox_t mbox, unsigned char* dst_buff, size_t* dst_buff_size, - simix_match_func_t match_fun, void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), - void* data, double rate) +XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr +simcall_HANDLER_comm_irecv(smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_mailbox_t mbox, unsigned char* dst_buff, + size_t* dst_buff_size, bool (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*), + void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), void* data, + double rate) { simgrid::kernel::activity::CommImplPtr this_synchro = simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl()); @@ -121,7 +123,6 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv( simgrid::kernel::activity::CommImplPtr other_comm; // communication already done, get it inside the list of completed comms if (mbox->permanent_receiver_ != nullptr && not mbox->done_comm_queue_.empty()) { - XBT_DEBUG("We have a comm that has probably already been received, trying to match it, to skip the communication"); // find a match in the list of already received comms other_comm = mbox->find_matching_comm(simgrid::kernel::activity::CommImpl::Type::SEND, match_fun, data, @@ -161,7 +162,7 @@ XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv( other_comm->state_ = simgrid::kernel::activity::State::READY; other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY); } - receiver->comms.push_back(other_comm); + receiver->activities.push_back(other_comm); } /* Setup communication synchro */ @@ -313,6 +314,7 @@ void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi simcall->timeout_cb_ = NULL; } else { simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() { + simcall->timeout_cb_ = nullptr; SIMIX_waitany_remove_simcall_from_actions(simcall); simcall_comm_waitany__set__result(simcall, -1); simcall->issuer_->simcall_answer(); @@ -430,7 +432,6 @@ CommImpl* CommImpl::start() { /* If both the sender and the receiver are already there, start the communication */ if (state_ == State::READY) { - s4u::Host* sender = src_actor_->get_host(); s4u::Host* receiver = dst_actor_->get_host(); @@ -608,10 +609,9 @@ void CommImpl::finish() /* Check out for errors */ if (not simcall->issuer_->get_host()->is_on()) { - simcall->issuer_->context_->iwannadie = true; + simcall->issuer_->context_->set_wannadie(); } else { switch (state_) { - case State::DONE: XBT_DEBUG("Communication %p complete!", this); copy_data(); @@ -629,7 +629,7 @@ void CommImpl::finish() case State::SRC_HOST_FAILURE: if (simcall->issuer_ == src_actor_) - simcall->issuer_->context_->iwannadie = true; + simcall->issuer_->context_->set_wannadie(); else simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); @@ -637,7 +637,7 @@ void CommImpl::finish() case State::DST_HOST_FAILURE: if (simcall->issuer_ == dst_actor_) - simcall->issuer_->context_->iwannadie = true; + simcall->issuer_->context_->set_wannadie(); else simcall->issuer_->exception_ = std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed")); @@ -700,17 +700,17 @@ void CommImpl::finish() } simcall->issuer_->waiting_synchro = nullptr; - simcall->issuer_->comms.remove(this); + simcall->issuer_->activities.remove(this); if (detached_) { if (simcall->issuer_ == src_actor_) { if (dst_actor_) - dst_actor_->comms.remove(this); + dst_actor_->activities.remove(this); } else if (simcall->issuer_ == dst_actor_) { if (src_actor_) - src_actor_->comms.remove(this); + src_actor_->activities.remove(this); } else { - dst_actor_->comms.remove(this); - src_actor_->comms.remove(this); + dst_actor_->activities.remove(this); + src_actor_->activities.remove(this); } } }