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, false);
simcall->mc_value_ = 0;
- simcall_HANDLER_comm_wait(simcall, static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
+ comm->wait_for(simcall->issuer_, timeout);
}
XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr simcall_HANDLER_comm_isend(
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->mc_value_ = 0;
- simcall_HANDLER_comm_wait(simcall, static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
+ comm->wait_for(simcall->issuer_, timeout);
}
XBT_PRIVATE simgrid::kernel::activity::ActivityImplPtr
void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm, double timeout)
{
- /* Associate this simcall to the wait synchro */
- XBT_DEBUG("simcall_HANDLER_comm_wait, %p", comm);
-
- comm->register_simcall(simcall);
-
- if (MC_is_active() || MC_record_replay_is_active()) {
- int idx = simcall->mc_value_;
- if (idx == 0) {
- 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_ = simgrid::kernel::activity::State::SRC_TIMEOUT;
- else
- comm->state_ = simgrid::kernel::activity::State::DST_TIMEOUT;
- }
-
- comm->finish();
- return;
- }
-
- /* If the synchro has already finish perform the error handling, */
- /* otherwise set up a waiting timeout on the right side */
- 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_activity(comm);
-
- if (simcall->issuer_ == comm->src_actor_)
- comm->src_timeout_ = sleep;
- else
- comm->dst_timeout_ = sleep;
- }
+ comm->wait_for(simcall->issuer_, timeout);
}
bool simcall_HANDLER_comm_test(smx_simcall_t, simgrid::kernel::activity::CommImpl* comm)
return ActivityImpl::test();
}
+void CommImpl::wait_for(actor::ActorImpl* issuer, double timeout)
+{
+ XBT_DEBUG("CommImpl::wait_for(%g), %p, state %s", timeout, this, to_c_str(state_));
+
+ /* Associate this simcall to the wait synchro */
+ register_simcall(&issuer->simcall_);
+
+ if (MC_is_active() || MC_record_replay_is_active()) {
+ int idx = issuer->simcall_.mc_value_;
+ if (idx == 0) {
+ state_ = 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;
+ state_ = (issuer == src_actor_ ? State::SRC_TIMEOUT : State::DST_TIMEOUT);
+ }
+ finish();
+ return;
+ }
+
+ /* If the synchro has already finish perform the error handling, */
+ /* otherwise set up a waiting timeout on the right side */
+ 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);
+ sleep->set_activity(this);
+
+ if (issuer == src_actor_)
+ src_timeout_ = sleep;
+ else
+ dst_timeout_ = sleep;
+ }
+}
+
int CommImpl::test_any(actor::ActorImpl* issuer, const std::vector<CommImpl*>& comms)
{
if (MC_is_active() || MC_record_replay_is_active()) {
auto* comm = comms[idx];
comm->simcalls_.push_back(&issuer->simcall_);
simcall_comm_waitany__set__result(&issuer->simcall_, idx);
- comm->state_ = simgrid::kernel::activity::State::DONE;
+ comm->state_ = State::DONE;
comm->finish();
return;
}
if (timeout < 0.0) {
issuer->simcall_.timeout_cb_ = nullptr;
} else {
- issuer->simcall_.timeout_cb_ = simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [issuer, comms]() {
+ issuer->simcall_.timeout_cb_ = simix::Timer::set(SIMIX_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;
comm->simcalls_.push_back(&issuer->simcall_);
/* see if the synchro is already finished */
- if (comm->state_ != simgrid::kernel::activity::State::WAITING &&
- comm->state_ != simgrid::kernel::activity::State::RUNNING) {
+ if (comm->state_ != State::WAITING && comm->state_ != State::RUNNING) {
comm->finish();
break;
}
if (simcall->call_ == simix::Simcall::NONE) // FIXME: maybe a better way to handle this case
continue; // if actor handling comm is killed
if (simcall->call_ == simix::Simcall::COMM_WAITANY) {
- simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(simcall);
- size_t count = simcall_comm_waitany__get__count(simcall);
+ 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++)
comms[i]->unregister_simcall(simcall);
if (simcall->timeout_cb_) {
switch (state_) {
case State::SRC_TIMEOUT:
simcall->issuer_->exception_ = std::make_exception_ptr(
- simgrid::TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the sender"));
+ TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the sender"));
break;
case State::DST_TIMEOUT:
simcall->issuer_->exception_ = std::make_exception_ptr(
- simgrid::TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the receiver"));
+ TimeoutException(XBT_THROW_POINT, "Communication timeouted because of the receiver"));
break;
case State::SRC_HOST_FAILURE:
simcall->issuer_->context_->set_wannadie();
else
simcall->issuer_->exception_ =
- std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
+ std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
break;
case State::DST_HOST_FAILURE:
simcall->issuer_->context_->set_wannadie();
else
simcall->issuer_->exception_ =
- std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
+ std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Remote peer failed"));
break;
case State::LINK_FAILURE:
XBT_DEBUG("I'm neither source nor dest");
}
simcall->issuer_->throw_exception(
- std::make_exception_ptr(simgrid::NetworkFailureException(XBT_THROW_POINT, "Link failure")));
+ std::make_exception_ptr(NetworkFailureException(XBT_THROW_POINT, "Link failure")));
break;
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"));
+ simcall->issuer_->exception_ =
+ std::make_exception_ptr(CancelException(XBT_THROW_POINT, "Communication canceled by the sender"));
else
- simcall->issuer_->exception_ = std::make_exception_ptr(
- simgrid::CancelException(XBT_THROW_POINT, "Communication canceled by the receiver"));
+ simcall->issuer_->exception_ =
+ std::make_exception_ptr(CancelException(XBT_THROW_POINT, "Communication canceled by the receiver"));
break;
default:
// In order to modify the exception we have to rethrow it:
try {
std::rethrow_exception(simcall->issuer_->exception_);
- } catch (simgrid::Exception& e) {
+ } catch (Exception& e) {
e.set_value(rank);
}
}
