XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_network, simix, "SIMIX network-related synchronization");
XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t src, smx_mailbox_t mbox, double task_size,
- double rate, void* src_buff, size_t src_buff_size,
- int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
+ double rate, unsigned char* src_buff, size_t src_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 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);
- SIMCALL_SET_MC_VALUE(simcall, 0);
+ SIMCALL_SET_MC_VALUE(*simcall, 0);
simcall_HANDLER_comm_wait(simcall, static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
}
XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_isend(
- smx_simcall_t /*simcall*/, smx_actor_t src_proc, smx_mailbox_t mbox, double task_size, double rate, void* src_buff,
- size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
+ 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,
+ 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, int detached)
+ void* data, bool detached)
{
XBT_DEBUG("send from mailbox %p", mbox);
/* Prepare a synchro describing us, so that it gets passed to the user-provided filter of other side */
- simgrid::kernel::activity::CommImplPtr this_comm = simgrid::kernel::activity::CommImplPtr(
- new simgrid::kernel::activity::CommImpl(simgrid::kernel::activity::CommImpl::Type::SEND));
+ simgrid::kernel::activity::CommImplPtr this_comm =
+ simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl());
+ this_comm->set_type(simgrid::kernel::activity::CommImpl::Type::SEND);
/* Look for communication synchro matching our needs. We also provide a description of
* ourself so that the other side also gets a chance of choosing if it wants to match with us.
if (mbox->permanent_receiver_ != nullptr) {
// this mailbox is for small messages, which have to be sent right now
- other_comm->state_ = SIMIX_READY;
+ other_comm->state_ = simgrid::kernel::activity::State::READY;
other_comm->dst_actor_ = mbox->permanent_receiver_.get();
mbox->done_comm_queue_.push_back(other_comm);
XBT_DEBUG("pushing a message into the permanent receive list %p, comm %p", mbox, other_comm.get());
} else {
XBT_DEBUG("Receive already pushed");
- other_comm->state_ = SIMIX_READY;
- other_comm->type = simgrid::kernel::activity::CommImpl::Type::READY;
+ other_comm->state_ = simgrid::kernel::activity::State::READY;
+ other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY);
}
- src_proc->comms.push_back(other_comm);
if (detached) {
- other_comm->detached = true;
+ other_comm->detach();
other_comm->clean_fun = clean_fun;
} else {
other_comm->clean_fun = nullptr;
+ src_proc->comms.push_back(other_comm);
}
/* Setup the communication synchro */
other_comm->src_actor_ = src_proc;
- other_comm->task_size_ = task_size;
- other_comm->rate_ = rate;
- other_comm->src_buff_ = src_buff;
- other_comm->src_buff_size_ = src_buff_size;
other_comm->src_data_ = data;
+ (*other_comm).set_src_buff(src_buff, src_buff_size).set_size(task_size).set_rate(rate);
other_comm->match_fun = match_fun;
other_comm->copy_data_fun = copy_data_fun;
- if (MC_is_active() || MC_record_replay_is_active()) {
- other_comm->state_ = SIMIX_RUNNING;
- return (detached ? nullptr : other_comm);
- }
-
- other_comm->start();
+ if (MC_is_active() || MC_record_replay_is_active())
+ other_comm->state_ = simgrid::kernel::activity::State::RUNNING;
+ else
+ other_comm->start();
return (detached ? nullptr : other_comm);
}
XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t receiver, smx_mailbox_t mbox,
- void* dst_buff, size_t* dst_buff_size,
- int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
+ 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 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);
- SIMCALL_SET_MC_VALUE(simcall, 0);
+ SIMCALL_SET_MC_VALUE(*simcall, 0);
simcall_HANDLER_comm_wait(simcall, static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
}
XBT_PRIVATE smx_activity_t simcall_HANDLER_comm_irecv(
- smx_simcall_t /*simcall*/, smx_actor_t receiver, smx_mailbox_t mbox, void* 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)
+ 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(simgrid::kernel::activity::CommImpl::Type::RECEIVE));
+ simgrid::kernel::activity::CommImplPtr this_synchro =
+ simgrid::kernel::activity::CommImplPtr(new simgrid::kernel::activity::CommImpl());
+ this_synchro->set_type(simgrid::kernel::activity::CommImpl::Type::RECEIVE);
XBT_DEBUG("recv from mbox %p. this_synchro=%p", mbox, this_synchro.get());
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,
other_comm = std::move(this_synchro);
mbox->push(other_comm);
} else {
- if (other_comm->surf_action_ && other_comm->remains() < 1e-12) {
+ 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->state_ = SIMIX_DONE;
- other_comm->type = simgrid::kernel::activity::CommImpl::Type::DONE;
- other_comm->mbox = nullptr;
+ other_comm->state_ = simgrid::kernel::activity::State::DONE;
+ other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::DONE).set_mailbox(nullptr);
}
}
} else {
} else {
XBT_DEBUG("Match my %p with the existing %p", this_synchro.get(), other_comm.get());
- other_comm->state_ = SIMIX_READY;
- other_comm->type = simgrid::kernel::activity::CommImpl::Type::READY;
+ other_comm->state_ = simgrid::kernel::activity::State::READY;
+ other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY);
}
receiver->comms.push_back(other_comm);
}
/* Setup communication synchro */
other_comm->dst_actor_ = receiver;
- other_comm->dst_buff_ = dst_buff;
- other_comm->dst_buff_size_ = dst_buff_size;
other_comm->dst_data_ = data;
+ other_comm->set_dst_buff(dst_buff, dst_buff_size);
- if (rate > -1.0 && (other_comm->rate_ < 0.0 || rate < other_comm->rate_))
- other_comm->rate_ = rate;
+ if (rate > -1.0 && (other_comm->get_rate() < 0.0 || rate < other_comm->get_rate()))
+ other_comm->set_rate(rate);
other_comm->match_fun = match_fun;
other_comm->copy_data_fun = copy_data_fun;
if (MC_is_active() || MC_record_replay_is_active()) {
- other_comm->state_ = SIMIX_RUNNING;
+ other_comm->state_ = simgrid::kernel::activity::State::RUNNING;
return other_comm;
}
other_comm->start();
/* Associate this simcall to the wait synchro */
XBT_DEBUG("simcall_HANDLER_comm_wait, %p", comm);
- comm->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = comm;
+ comm->register_simcall(simcall);
if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = SIMCALL_GET_MC_VALUE(simcall);
+ int idx = SIMCALL_GET_MC_VALUE(*simcall);
if (idx == 0) {
- comm->state_ = SIMIX_DONE;
+ comm->state_ = simgrid::kernel::activity::State::DONE;
} else {
/* If we reached this point, the wait simcall must have a timeout */
/* Otherwise it shouldn't be enabled and executed by the MC */
if (timeout < 0.0)
THROW_IMPOSSIBLE;
- if (comm->src_actor_ == simcall->issuer)
- comm->state_ = SIMIX_SRC_TIMEOUT;
+ if (comm->src_actor_ == simcall->issuer_)
+ comm->state_ = simgrid::kernel::activity::State::SRC_TIMEOUT;
else
- comm->state_ = SIMIX_DST_TIMEOUT;
+ comm->state_ = simgrid::kernel::activity::State::DST_TIMEOUT;
}
comm->finish();
/* If the synchro has already finish perform the error handling, */
/* otherwise set up a waiting timeout on the right side */
- if (comm->state_ != SIMIX_WAITING && comm->state_ != SIMIX_RUNNING) {
+ if (comm->state_ != simgrid::kernel::activity::State::WAITING &&
+ comm->state_ != simgrid::kernel::activity::State::RUNNING) {
comm->finish();
} else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */
- simgrid::kernel::resource::Action* sleep = simcall->issuer->get_host()->pimpl_cpu->sleep(timeout);
- sleep->set_data(comm);
+ simgrid::kernel::resource::Action* sleep = simcall->issuer_->get_host()->pimpl_cpu->sleep(timeout);
+ sleep->set_activity(comm);
- if (simcall->issuer == comm->src_actor_)
+ if (simcall->issuer_ == comm->src_actor_)
comm->src_timeout_ = sleep;
else
comm->dst_timeout_ = sleep;
void simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm)
{
- int res;
+ bool res;
if (MC_is_active() || MC_record_replay_is_active()) {
res = comm->src_actor_ && comm->dst_actor_;
if (res)
- comm->state_ = SIMIX_DONE;
+ comm->state_ = simgrid::kernel::activity::State::DONE;
} else {
- res = comm->state_ != SIMIX_WAITING && comm->state_ != SIMIX_RUNNING;
+ res = comm->state_ != simgrid::kernel::activity::State::WAITING &&
+ comm->state_ != simgrid::kernel::activity::State::RUNNING;
}
simcall_comm_test__set__result(simcall, res);
- if (simcall_comm_test__get__result(simcall)) {
+ if (res) {
comm->simcalls_.push_back(simcall);
comm->finish();
} else {
- SIMIX_simcall_answer(simcall);
+ simcall->issuer_->simcall_answer();
}
}
-void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::ActivityImplPtr comms[],
- size_t count)
+void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count)
{
// The default result is -1 -- this means, "nothing is ready".
// It can be changed below, but only if something matches.
simcall_comm_testany__set__result(simcall, -1);
if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = SIMCALL_GET_MC_VALUE(simcall);
+ int idx = SIMCALL_GET_MC_VALUE(*simcall);
if (idx == -1) {
- SIMIX_simcall_answer(simcall);
+ simcall->issuer_->simcall_answer();
} else {
- simgrid::kernel::activity::ActivityImplPtr synchro = comms[idx];
+ simgrid::kernel::activity::CommImpl* comm = comms[idx];
simcall_comm_testany__set__result(simcall, idx);
- synchro->simcalls_.push_back(simcall);
- synchro->state_ = SIMIX_DONE;
- boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro)->finish();
+ comm->simcalls_.push_back(simcall);
+ comm->state_ = simgrid::kernel::activity::State::DONE;
+ comm->finish();
}
return;
}
for (std::size_t i = 0; i != count; ++i) {
- simgrid::kernel::activity::ActivityImplPtr synchro = comms[i];
- if (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING) {
+ simgrid::kernel::activity::CommImpl* comm = comms[i];
+ if (comm->state_ != simgrid::kernel::activity::State::WAITING &&
+ comm->state_ != simgrid::kernel::activity::State::RUNNING) {
simcall_comm_testany__set__result(simcall, i);
- synchro->simcalls_.push_back(simcall);
- boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro)->finish();
+ comm->simcalls_.push_back(simcall);
+ comm->finish();
return;
}
}
- SIMIX_simcall_answer(simcall);
+ simcall->issuer_->simcall_answer();
}
static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall)
{
- smx_activity_t* synchros = simcall_comm_waitany__get__comms(simcall);
- size_t count = simcall_comm_waitany__get__count(simcall);
+ simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(simcall);
+ size_t count = simcall_comm_waitany__get__count(simcall);
for (size_t i = 0; i < count; i++) {
- // Remove the first occurence of simcall:
- smx_activity_t& synchro = synchros[i];
- auto j = boost::range::find(synchro->simcalls_, simcall);
- if (j != synchro->simcalls_.end())
- synchro->simcalls_.erase(j);
+ // Remove the first occurrence of simcall:
+ auto* comm = comms[i];
+ auto j = boost::range::find(comm->simcalls_, simcall);
+ if (j != comm->simcalls_.end())
+ comm->simcalls_.erase(j);
}
}
-void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, smx_activity_t* synchros, size_t count, double timeout)
+void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comms[], size_t count,
+ double timeout)
{
if (MC_is_active() || MC_record_replay_is_active()) {
if (timeout > 0.0)
xbt_die("Timeout not implemented for waitany in the model-checker");
- int idx = SIMCALL_GET_MC_VALUE(simcall);
- smx_activity_t& synchro = synchros[idx];
- synchro->simcalls_.push_back(simcall);
+ int idx = SIMCALL_GET_MC_VALUE(*simcall);
+ auto* comm = comms[idx];
+ comm->simcalls_.push_back(simcall);
simcall_comm_waitany__set__result(simcall, idx);
- synchro->state_ = SIMIX_DONE;
- synchro->finish();
+ comm->state_ = simgrid::kernel::activity::State::DONE;
+ comm->finish();
return;
}
if (timeout < 0.0) {
- simcall->timer = NULL;
+ simcall->timeout_cb_ = NULL;
} else {
- simcall->timer = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() {
+ simcall->timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() {
SIMIX_waitany_remove_simcall_from_actions(simcall);
simcall_comm_waitany__set__result(simcall, -1);
- SIMIX_simcall_answer(simcall);
+ simcall->issuer_->simcall_answer();
});
}
for (size_t i = 0; i < count; i++) {
/* associate this simcall to the the synchro */
- smx_activity_t& synchro = synchros[i];
- synchro->simcalls_.push_back(simcall);
+ auto* comm = comms[i];
+ comm->simcalls_.push_back(simcall);
/* see if the synchro is already finished */
- if (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING) {
- synchro->finish();
+ if (comm->state_ != simgrid::kernel::activity::State::WAITING &&
+ comm->state_ != simgrid::kernel::activity::State::RUNNING) {
+ comm->finish();
break;
}
}
{
XBT_DEBUG("Copy the data over");
memcpy(comm->dst_buff_, buff, buff_size);
- if (comm->detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the
- // original buffer available to the application ASAP
+ if (comm->detached()) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the
+ // original buffer available to the application ASAP
xbt_free(buff);
comm->src_buff_ = nullptr;
}
namespace kernel {
namespace activity {
-CommImpl::CommImpl(CommImpl::Type type) : type(type)
+CommImpl& CommImpl::set_type(CommImpl::Type type)
+{
+ type_ = type;
+ return *this;
+}
+
+CommImpl& CommImpl::set_size(double size)
+{
+ size_ = size;
+ return *this;
+}
+
+CommImpl& CommImpl::set_rate(double rate)
+{
+ rate_ = rate;
+ return *this;
+}
+CommImpl& CommImpl::set_mailbox(MailboxImpl* mbox)
+{
+ mbox_ = mbox;
+ return *this;
+}
+
+CommImpl& CommImpl::set_src_buff(unsigned char* buff, size_t size)
{
- state_ = SIMIX_WAITING;
- src_data_ = nullptr;
- dst_data_ = nullptr;
- XBT_DEBUG("Create comm activity %p", this);
+ src_buff_ = buff;
+ src_buff_size_ = size;
+ return *this;
+}
+
+CommImpl& CommImpl::set_dst_buff(unsigned char* buff, size_t* size)
+{
+ dst_buff_ = buff;
+ dst_buff_size_ = size;
+ return *this;
+}
+
+CommImpl& CommImpl::detach()
+{
+ detached_ = true;
+ return *this;
}
CommImpl::~CommImpl()
{
- XBT_DEBUG("Really free communication %p", this);
+ XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast<int>(state_), detached_);
cleanupSurf();
- if (detached && state_ != SIMIX_DONE) {
+ if (detached_ && state_ != State::DONE) {
/* the communication has failed and was detached:
* we have to free the buffer */
if (clean_fun)
clean_fun(src_buff_);
src_buff_ = nullptr;
+ } else if (mbox_) {
+ mbox_->remove(this);
}
-
- if (mbox)
- mbox->remove(this);
}
/** @brief Starts the simulation of a communication synchro. */
-void CommImpl::start()
+CommImpl* CommImpl::start()
{
/* If both the sender and the receiver are already there, start the communication */
- if (state_ == SIMIX_READY) {
-
+ if (state_ == State::READY) {
s4u::Host* sender = src_actor_->get_host();
s4u::Host* receiver = dst_actor_->get_host();
- surf_action_ = surf_network_model->communicate(sender, receiver, task_size_, rate_);
- surf_action_->set_data(this);
- state_ = SIMIX_RUNNING;
+ surf_action_ = surf_network_model->communicate(sender, receiver, size_, rate_);
+ surf_action_->set_activity(this);
+ surf_action_->set_category(get_tracing_category());
+ state_ = State::RUNNING;
XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", this, sender->get_cname(),
receiver->get_cname(), surf_action_);
if (surf_action_->get_state() == resource::Action::State::FAILED) {
XBT_DEBUG("Communication from '%s' to '%s' failed to start because of a link failure", sender->get_cname(),
receiver->get_cname());
- state_ = SIMIX_LINK_FAILURE;
- cleanupSurf();
+ state_ = State::LINK_FAILURE;
+ post();
} else if (src_actor_->is_suspended() || dst_actor_->is_suspended()) {
/* If any of the process is suspended, create the synchro but stop its execution,
surf_action_->suspend();
}
}
+
+ return this;
}
/** @brief Copy the communication data from the sender's buffer to the receiver's one */
{
size_t buff_size = src_buff_size_;
/* If there is no data to copy then return */
- if (not src_buff_ || not dst_buff_ || copied)
+ if (not src_buff_ || not dst_buff_ || copied_)
return;
XBT_DEBUG("Copying comm %p data from %s (%p) -> %s (%p) (%zu bytes)", this,
/* Set the copied flag so we copy data only once */
/* (this function might be called from both communication ends) */
- copied = true;
+ copied_ = true;
}
void CommImpl::suspend()
void CommImpl::cancel()
{
/* if the synchro is a waiting state means that it is still in a mbox so remove from it and delete it */
- if (state_ == SIMIX_WAITING) {
- mbox->remove(this);
- state_ = SIMIX_CANCELED;
+ if (state_ == State::WAITING) {
+ if (not detached_) {
+ mbox_->remove(this);
+ state_ = State::CANCELED;
+ }
} else if (not MC_is_active() /* when running the MC there are no surf actions */
- && not MC_record_replay_is_active() && (state_ == SIMIX_READY || state_ == SIMIX_RUNNING)) {
+ && not MC_record_replay_is_active() && (state_ == State::READY || state_ == State::RUNNING)) {
surf_action_->cancel();
}
}
-/** @brief get the amount remaining from the communication */
-double CommImpl::remains()
-{
- return surf_action_->get_remains();
-}
-
/** @brief This is part of the cleanup process, probably an internal command */
void CommImpl::cleanupSurf()
{
- if (surf_action_) {
- surf_action_->unref();
- surf_action_ = nullptr;
- }
+ clean_action();
if (src_timeout_) {
src_timeout_->unref();
{
/* Update synchro state */
if (src_timeout_ && src_timeout_->get_state() == resource::Action::State::FINISHED)
- state_ = SIMIX_SRC_TIMEOUT;
+ state_ = State::SRC_TIMEOUT;
else if (dst_timeout_ && dst_timeout_->get_state() == resource::Action::State::FINISHED)
- state_ = SIMIX_DST_TIMEOUT;
+ state_ = State::DST_TIMEOUT;
else if (src_timeout_ && src_timeout_->get_state() == resource::Action::State::FAILED)
- state_ = SIMIX_SRC_HOST_FAILURE;
+ state_ = State::SRC_HOST_FAILURE;
else if (dst_timeout_ && dst_timeout_->get_state() == resource::Action::State::FAILED)
- state_ = SIMIX_DST_HOST_FAILURE;
+ state_ = State::DST_HOST_FAILURE;
else if (surf_action_ && surf_action_->get_state() == resource::Action::State::FAILED) {
- state_ = SIMIX_LINK_FAILURE;
+ state_ = State::LINK_FAILURE;
} else
- state_ = SIMIX_DONE;
+ state_ = State::DONE;
XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", this, (int)state_,
- src_actor_.get(), dst_actor_.get(), detached);
+ src_actor_.get(), dst_actor_.get(), detached_);
/* destroy the surf actions associated with the Simix communication */
cleanupSurf();
- /* if there are simcalls associated with the synchro, then answer them */
- if (not simcalls_.empty()) {
- finish();
- }
+ /* Answer all simcalls associated with the synchro */
+ finish();
}
void CommImpl::finish()
* list. Afterwards, get the position of the actual synchro in the waitany list and return it as the result of the
* simcall */
- if (simcall->call == SIMCALL_NONE) // FIXME: maybe a better way to handle this case
- continue; // if process handling comm is killed
- if (simcall->call == SIMCALL_COMM_WAITANY) {
+ if (simcall->call_ == SIMCALL_NONE) // FIXME: maybe a better way to handle this case
+ continue; // if actor handling comm is killed
+ if (simcall->call_ == SIMCALL_COMM_WAITANY) {
SIMIX_waitany_remove_simcall_from_actions(simcall);
- if (simcall->timer) {
- simcall->timer->remove();
- simcall->timer = nullptr;
+ if (simcall->timeout_cb_) {
+ simcall->timeout_cb_->remove();
+ simcall->timeout_cb_ = nullptr;
}
if (not MC_is_active() && not MC_record_replay_is_active()) {
CommImpl** comms = simcall_comm_waitany__get__comms(simcall);
}
/* If the synchro is still in a rendez-vous point then remove from it */
- if (mbox)
- mbox->remove(this);
+ if (mbox_)
+ mbox_->remove(this);
XBT_DEBUG("CommImpl::finish(): synchro state = %d", static_cast<int>(state_));
/* Check out for errors */
- if (not simcall->issuer->get_host()->is_on()) {
- simcall->issuer->context_->iwannadie = true;
- simcall->issuer->exception_ =
- std::make_exception_ptr(simgrid::HostFailureException(XBT_THROW_POINT, "Host failed"));
+ if (not simcall->issuer_->get_host()->is_on()) {
+ simcall->issuer_->context_->iwannadie = true;
} else {
switch (state_) {
-
- case SIMIX_DONE:
+ case State::DONE:
XBT_DEBUG("Communication %p complete!", this);
copy_data();
break;
- case SIMIX_SRC_TIMEOUT:
- simcall->issuer->exception_ = std::make_exception_ptr(
- simgrid::TimeoutError(XBT_THROW_POINT, "Communication timeouted because of the sender"));
+ case State::SRC_TIMEOUT:
+ simcall->issuer_->exception_ = std::make_exception_ptr(
+ simgrid::TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the sender"));
break;
- case SIMIX_DST_TIMEOUT:
- simcall->issuer->exception_ = std::make_exception_ptr(
- simgrid::TimeoutError(XBT_THROW_POINT, "Communication timeouted because of the receiver"));
+ case State::DST_TIMEOUT:
+ simcall->issuer_->exception_ = std::make_exception_ptr(
+ simgrid::TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the receiver"));
break;
- case SIMIX_SRC_HOST_FAILURE:
- if (simcall->issuer == src_actor_)
- simcall->issuer->context_->iwannadie = true;
+ case State::SRC_HOST_FAILURE:
+ if (simcall->issuer_ == src_actor_)
+ simcall->issuer_->context_->iwannadie = true;
else
- simcall->issuer->exception_ =
+ simcall->issuer_->exception_ =
std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
break;
- case SIMIX_DST_HOST_FAILURE:
- if (simcall->issuer == dst_actor_)
- simcall->issuer->context_->iwannadie = true;
+ case State::DST_HOST_FAILURE:
+ if (simcall->issuer_ == dst_actor_)
+ simcall->issuer_->context_->iwannadie = true;
else
- simcall->issuer->exception_ =
+ simcall->issuer_->exception_ =
std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
break;
- case SIMIX_LINK_FAILURE:
+ case State::LINK_FAILURE:
XBT_DEBUG("Link failure in synchro %p between '%s' and '%s': posting an exception to the issuer: %s (%p) "
"detached:%d",
this, src_actor_ ? src_actor_->get_host()->get_cname() : nullptr,
- dst_actor_ ? dst_actor_->get_host()->get_cname() : nullptr, simcall->issuer->get_cname(),
- simcall->issuer, detached);
- if (src_actor_ == simcall->issuer) {
+ dst_actor_ ? dst_actor_->get_host()->get_cname() : nullptr, simcall->issuer_->get_cname(),
+ simcall->issuer_, detached_);
+ if (src_actor_ == simcall->issuer_) {
XBT_DEBUG("I'm source");
- } else if (dst_actor_ == simcall->issuer) {
+ } else if (dst_actor_ == simcall->issuer_) {
XBT_DEBUG("I'm dest");
} else {
XBT_DEBUG("I'm neither source nor dest");
}
- simcall->issuer->throw_exception(
+ simcall->issuer_->throw_exception(
std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Link failure")));
break;
- case SIMIX_CANCELED:
- if (simcall->issuer == dst_actor_)
- simcall->issuer->exception_ = std::make_exception_ptr(
+ case State::CANCELED:
+ if (simcall->issuer_ == dst_actor_)
+ simcall->issuer_->exception_ = std::make_exception_ptr(
simgrid::CancelException(XBT_THROW_POINT, "Communication canceled by the sender"));
else
- simcall->issuer->exception_ = std::make_exception_ptr(
+ simcall->issuer_->exception_ = std::make_exception_ptr(
simgrid::CancelException(XBT_THROW_POINT, "Communication canceled by the receiver"));
break;
default:
xbt_die("Unexpected synchro state in CommImpl::finish: %d", static_cast<int>(state_));
}
+ simcall->issuer_->simcall_answer();
}
/* if there is an exception during a waitany or a testany, indicate the position of the failed communication */
- if (simcall->issuer->exception_ &&
- (simcall->call == SIMCALL_COMM_WAITANY || simcall->call == SIMCALL_COMM_TESTANY)) {
+ if (simcall->issuer_->exception_ &&
+ (simcall->call_ == SIMCALL_COMM_WAITANY || simcall->call_ == SIMCALL_COMM_TESTANY)) {
// First retrieve the rank of our failing synchro
CommImpl** comms;
size_t count;
- if (simcall->call == SIMCALL_COMM_WAITANY) {
+ if (simcall->call_ == SIMCALL_COMM_WAITANY) {
comms = simcall_comm_waitany__get__comms(simcall);
count = simcall_comm_waitany__get__count(simcall);
} else {
- /* simcall->call == SIMCALL_COMM_TESTANY */
+ /* simcall->call_ == SIMCALL_COMM_TESTANY */
comms = simcall_comm_testany__get__comms(simcall);
count = simcall_comm_testany__get__count(simcall);
}
// In order to modify the exception we have to rethrow it:
try {
- std::rethrow_exception(simcall->issuer->exception_);
- } catch (simgrid::TimeoutError& e) {
- e.value = rank;
- simcall->issuer->exception_ = std::make_exception_ptr(e);
- } catch (simgrid::NetworkFailureException& e) {
- e.value = rank;
- simcall->issuer->exception_ = std::make_exception_ptr(e);
- } catch (simgrid::CancelException& e) {
- e.value = rank;
- simcall->issuer->exception_ = std::make_exception_ptr(e);
+ std::rethrow_exception(simcall->issuer_->exception_);
+ } catch (simgrid::Exception& e) {
+ e.value = rank;
}
}
- simcall->issuer->waiting_synchro = nullptr;
- simcall->issuer->comms.remove(this);
- if (detached) {
- if (simcall->issuer == src_actor_) {
+ simcall->issuer_->waiting_synchro = nullptr;
+ simcall->issuer_->comms.remove(this);
+ if (detached_) {
+ if (simcall->issuer_ == src_actor_) {
if (dst_actor_)
dst_actor_->comms.remove(this);
- } else if (simcall->issuer == dst_actor_) {
+ } else if (simcall->issuer_ == dst_actor_) {
if (src_actor_)
src_actor_->comms.remove(this);
} else {
src_actor_->comms.remove(this);
}
}
-
- if (simcall->issuer->get_host()->is_on())
- SIMIX_simcall_answer(simcall);
- else
- simcall->issuer->context_->iwannadie = true;
}
}
