/* 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 <simgrid/Exception.hpp>
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Host.hpp>
+
#include "src/kernel/activity/CommImpl.hpp"
-#include "simgrid/Exception.hpp"
-#include "simgrid/kernel/resource/Action.hpp"
-#include "simgrid/kernel/routing/NetPoint.hpp"
-#include "simgrid/modelchecker.h"
-#include "simgrid/s4u/Host.hpp"
#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-#include "src/surf/surf_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization");
if (not other_comm) {
other_comm = std::move(this_comm);
- if (mbox->permanent_receiver_ != nullptr) {
+ if (mbox->is_permanent()) {
// this mailbox is for small messages, which have to be sent right now
other_comm->state_ = simgrid::kernel::activity::State::READY;
- other_comm->dst_actor_ = mbox->permanent_receiver_.get();
- mbox->done_comm_queue_.push_back(other_comm);
+ other_comm->dst_actor_ = mbox->get_permanent_receiver().get();
+ mbox->push_done(other_comm);
XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, other_comm.get());
} else {
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()) {
+ if (mbox->is_permanent() && mbox->has_some_done_comm()) {
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,
/*remove_matching*/ true);
if (other_comm == nullptr) {
- XBT_DEBUG("Receive pushed first (%zu comm enqueued so far)", mbox->comm_queue_.size());
+ XBT_DEBUG("Receive pushed first (%zu comm enqueued so far)", mbox->size());
other_comm = std::move(this_synchro);
mbox->push(other_comm);
} else {
return comm->test();
}
-int simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count)
+ssize_t simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count)
{
std::vector<simgrid::kernel::activity::CommImpl*> comms_vec(comms, comms + count);
return simgrid::kernel::activity::CommImpl::test_any(simcall->issuer_, comms_vec);
/******************************************************************************/
/* SIMIX_comm_copy_data callbacks */
/******************************************************************************/
+// XBT_ATTRIB_DEPRECATED_v333
void SIMIX_comm_set_copy_data_callback(void (*callback)(simgrid::kernel::activity::CommImpl*, void*, size_t))
{
simgrid::kernel::activity::CommImpl::set_copy_data_callback(callback);
from_ = from_ != nullptr ? from_ : src_actor_->get_host();
to_ = to_ != nullptr ? to_ : dst_actor_->get_host();
- /* FIXME[donassolo]: getting the network_model from the origin host
- * Soon we need to change this function to first get the routes and later
- * create the respective surf actions */
+ /* Getting the network_model from the origin host
+ * Valid while we have a single network model, otherwise we would need to change this function to first get the
+ * routes and later create the respective surf actions */
auto net_model = from_->get_netpoint()->get_englobing_zone()->get_network_model();
surf_action_ = net_model->communicate(from_, to_, size_, rate_);
} else if ((src_actor_ != nullptr && src_actor_->is_suspended()) ||
(dst_actor_ != nullptr && dst_actor_->is_suspended())) {
- /* If any of the process is suspended, create the synchro but stop its execution,
- it will be restarted when the sender process resume */
+ /* If any of the actor is suspended, create the synchro but stop its execution,
+ it will be restarted when the sender actor resume */
if (src_actor_->is_suspended())
XBT_DEBUG("The communication is suspended on startup because src (%s@%s) was suspended since it initiated the "
"communication",
return;
XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", this,
- src_actor_ ? src_actor_->get_host()->get_cname() : "a finished process", src_buff_,
- dst_actor_ ? dst_actor_->get_host()->get_cname() : "a finished process", dst_buff_, buff_size);
+ src_actor_ ? src_actor_->get_host()->get_cname() : "a finished actor", src_buff_,
+ dst_actor_ ? dst_actor_->get_host()->get_cname() : "a finished actor", dst_buff_, buff_size);
/* Copy at most dst_buff_size bytes of the message to receiver's buffer */
if (dst_buff_size_) {
if (state_ != State::WAITING && state_ != State::RUNNING) {
finish();
} else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */
- resource::Action* sleep = issuer->get_host()->pimpl_cpu->sleep(timeout);
+ resource::Action* sleep = issuer->get_host()->get_cpu()->sleep(timeout);
sleep->set_activity(this);
if (issuer == src_actor_)
}
}
-int CommImpl::test_any(const actor::ActorImpl* issuer, const std::vector<CommImpl*>& comms)
+ssize_t CommImpl::test_any(const actor::ActorImpl* issuer, const std::vector<CommImpl*>& comms)
{
if (MC_is_active() || MC_record_replay_is_active()) {
int idx = issuer->simcall_.mc_value_;
if (timeout < 0.0) {
issuer->simcall_.timeout_cb_ = nullptr;
} else {
- issuer->simcall_.timeout_cb_ = simix::Timer::set(SIMIX_get_clock() + timeout, [issuer, comms]() {
+ issuer->simcall_.timeout_cb_ = timer::Timer::set(s4u::Engine::get_clock() + timeout, [issuer, comms]() {
// FIXME: Vector `comms' is copied here. Use a reference once its lifetime is extended (i.e. when the simcall is
// modernized).
issuer->simcall_.timeout_cb_ = nullptr;
simcall->timeout_cb_ = nullptr;
}
if (not MC_is_active() && not MC_record_replay_is_active()) {
- CommImpl** element = std::find(comms, comms + count, this);
- int rank = (element != comms + count) ? element - comms : -1;
+ auto element = std::find(comms, comms + count, this);
+ ssize_t rank = (element != comms + count) ? element - comms : -1;
simcall_comm_waitany__set__result(simcall, rank);
}
}
simcall->issuer_->context_->set_wannadie();
} else {
switch (state_) {
+ case State::FAILED:
+ simcall->issuer_->exception_ =
+ std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
+ break;
case State::SRC_TIMEOUT:
simcall->issuer_->exception_ = std::make_exception_ptr(
TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the sender"));
case State::SRC_HOST_FAILURE:
if (simcall->issuer_ == src_actor_)
simcall->issuer_->context_->set_wannadie();
- else
+ else {
+ state_ = kernel::activity::State::FAILED;
simcall->issuer_->exception_ =
std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
+ }
break;
case State::DST_HOST_FAILURE:
if (simcall->issuer_ == dst_actor_)
simcall->issuer_->context_->set_wannadie();
- else
+ else {
+ state_ = kernel::activity::State::FAILED;
simcall->issuer_->exception_ =
std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
+ }
break;
case State::LINK_FAILURE:
} else {
XBT_DEBUG("I'm neither source nor dest");
}
+ state_ = kernel::activity::State::FAILED;
simcall->issuer_->throw_exception(
std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Link failure")));
break;
comms = simcall_comm_testany__get__comms(simcall);
count = simcall_comm_testany__get__count(simcall);
}
- CommImpl** element = std::find(comms, comms + count, this);
- int rank = (element != comms + count) ? element - comms : -1;
+ auto element = std::find(comms, comms + count, this);
+ ssize_t rank = (element != comms + count) ? element - comms : -1;
// In order to modify the exception we have to rethrow it:
try {
std::rethrow_exception(simcall->issuer_->exception_);
