#define SIMIX_H_NO_DEPRECATED_WARNING // avoid deprecation warning on include (remove with XBT_ATTRIB_DEPRECATED_v333)
#include <simgrid/simix.h>
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
-#include "src/kernel/context/Context.hpp"
#include "src/kernel/resource/CpuImpl.hpp"
-#include "src/kernel/resource/LinkImpl.hpp"
+#include "src/kernel/resource/NetworkModel.hpp"
#include "src/kernel/resource/StandardLinkImpl.hpp"
#include "src/mc/mc_replay.hpp"
simgrid::s4u::Comm::copy_pointer_callback(comm, buff, buff_size);
}
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
xbt::signal<void(CommImpl const&)> CommImpl::on_start;
xbt::signal<void(CommImpl const&)> CommImpl::on_completion;
-void (*CommImpl::copy_data_callback_)(CommImpl*, void*, size_t) = &s4u::Comm::copy_pointer_callback;
+std::function<void(CommImpl*, void*, size_t)> CommImpl::copy_data_callback_ = &s4u::Comm::copy_pointer_callback;
-void CommImpl::set_copy_data_callback(void (*callback)(CommImpl*, void*, size_t))
+void CommImpl::set_copy_data_callback(const std::function<void(CommImpl*, void*, size_t)>& callback)
{
copy_data_callback_ = callback;
}
CommImpl& CommImpl::set_source(s4u::Host* from)
{
+ xbt_assert( from_ == nullptr );
from_ = from;
+ add_host(from);
return *this;
}
CommImpl& CommImpl::set_destination(s4u::Host* to)
{
+ xbt_assert( to_ == nullptr );
to_ = to;
+ add_host(to_);
return *this;
}
CommImpl& CommImpl::detach()
{
detached_ = true;
+ EngineImpl::get_instance()->get_maestro()->activities_.emplace_back(this);
return *this;
}
// find a match in the list of already received comms
other_comm = mbox->find_matching_comm(CommImplType::SEND, observer->get_match_fun(), observer->get_payload(),
this_synchro, /*done*/ true, /*remove_matching*/ true);
- // if not found, assume the receiver came first, register it to the mailbox in the classical way
- if (not other_comm) {
- XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request "
- "into list");
- other_comm = std::move(this_synchro);
- mbox->push(other_comm);
+ if (other_comm && other_comm->surf_action_ && other_comm->get_remaining() < 1e-12) {
+ XBT_DEBUG("comm %p has been already sent, and is finished, destroy it", other_comm.get());
+ other_comm->set_state(State::DONE);
+ other_comm->set_mailbox(nullptr);
} else {
- if (other_comm->surf_action_ && other_comm->get_remaining() < 1e-12) {
- XBT_DEBUG("comm %p has been already sent, and is finished, destroy it", other_comm.get());
- other_comm->set_state(State::DONE);
- other_comm->set_mailbox(nullptr);
+ // if not found, assume the receiver came first, register it to the mailbox in the classical way
+ if (not other_comm) {
+ XBT_DEBUG("We have messages in the permanent receive list, but not the one we are looking for, pushing request "
+ "into list");
+ other_comm = std::move(this_synchro);
+ mbox->push(other_comm);
}
+ observer->get_issuer()->activities_.emplace_back(other_comm);
}
} else {
/* Prepare a comm describing us, so that it gets passed to the user-provided filter of other side */
case State::SRC_HOST_FAILURE:
if (issuer == src_actor_)
- issuer->context_->set_wannadie();
+ issuer->set_wannadie();
else {
set_state(State::FAILED);
issuer->exception_ = std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
case State::DST_HOST_FAILURE:
if (issuer == dst_actor_)
- issuer->context_->set_wannadie();
+ issuer->set_wannadie();
else {
set_state(State::FAILED);
issuer->exception_ = std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
/* Check out for errors */
if (not simcall->issuer_->get_host()->is_on()) {
- simcall->issuer_->context_->set_wannadie();
+ simcall->issuer_->set_wannadie();
} else {
// Do not answer to dying actors
- if (not simcall->issuer_->context_->wannadie()) {
+ if (not simcall->issuer_->wannadie()) {
set_exception(simcall->issuer_);
simcall->issuer_->simcall_answer();
}
}
}
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity