A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
small logic simplification
[simgrid.git]
/
src
/
kernel
/
activity
/
CommImpl.cpp
diff --git
a/src/kernel/activity/CommImpl.cpp
b/src/kernel/activity/CommImpl.cpp
index
4a1c8f6
..
b7351de
100644
(file)
--- a/
src/kernel/activity/CommImpl.cpp
+++ b/
src/kernel/activity/CommImpl.cpp
@@
-26,7
+26,7
@@
XBT_PRIVATE void simcall_HANDLER_comm_send(smx_simcall_t simcall, smx_actor_t sr
{
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);
}
@@
-104,7
+104,7
@@
XBT_PRIVATE void simcall_HANDLER_comm_recv(smx_simcall_t simcall, smx_actor_t re
{
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);
}
@@
-191,7
+191,7
@@
void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity:
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;
} else {
@@
-200,7
+200,7
@@
void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity:
if (timeout < 0.0)
THROW_IMPOSSIBLE;
- if (comm->src_actor_ == simcall->issuer)
+ if (comm->src_actor_ == simcall->issuer
_
)
comm->state_ = SIMIX_SRC_TIMEOUT;
else
comm->state_ = SIMIX_DST_TIMEOUT;
@@
-215,10
+215,10
@@
void simcall_HANDLER_comm_wait(smx_simcall_t simcall, simgrid::kernel::activity:
if (comm->state_ != SIMIX_WAITING && comm->state_ != SIMIX_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);
+ 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;
@@
-242,7
+242,7
@@
void simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity:
comm->simcalls_.push_back(simcall);
comm->finish();
} else {
-
SIMIX_simcall_answer(simcall
);
+
simcall->issuer_->simcall_answer(
);
}
}
@@
-253,9
+253,9
@@
void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activi
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::CommImpl* comm = comms[idx];
simcall_comm_testany__set__result(simcall, idx);
@@
-275,7
+275,7
@@
void simcall_HANDLER_comm_testany(smx_simcall_t simcall, simgrid::kernel::activi
return;
}
}
-
SIMIX_simcall_answer(simcall
);
+
simcall->issuer_->simcall_answer(
);
}
static void SIMIX_waitany_remove_simcall_from_actions(smx_simcall_t simcall)
@@
-297,7
+297,7
@@
void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi
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);
+ int idx = SIMCALL_GET_MC_VALUE(
*
simcall);
auto* comm = comms[idx];
comm->simcalls_.push_back(simcall);
simcall_comm_waitany__set__result(simcall, idx);
@@
-307,12
+307,12
@@
void simcall_HANDLER_comm_waitany(smx_simcall_t simcall, simgrid::kernel::activi
}
if (timeout < 0.0) {
- simcall->time
r
= NULL;
+ simcall->time
out_cb_
= NULL;
} else {
- simcall->time
r
= simgrid::simix::Timer::set(SIMIX_get_clock() + timeout, [simcall]() {
+ simcall->time
out_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(
);
});
}
@@
-443,7
+443,7
@@
CommImpl* CommImpl::start()
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
();
+
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,
@@
-580,13
+580,13
@@
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->time
r
) {
- simcall->time
r
->remove();
- simcall->time
r
= nullptr;
+ if (simcall->time
out_cb_
) {
+ simcall->time
out_cb_
->remove();
+ simcall->time
out_cb_
= nullptr;
}
if (not MC_is_active() && not MC_record_replay_is_active()) {
CommImpl** comms = simcall_comm_waitany__get__comms(simcall);
@@
-605,8
+605,8
@@
void CommImpl::finish()
/* Check out for errors */
- if (not simcall->issuer->get_host()->is_on()) {
- simcall->issuer->context_->iwannadie = true;
+ if (not simcall->issuer
_
->get_host()->is_on()) {
+ simcall->issuer
_
->context_->iwannadie = true;
} else {
switch (state_) {
@@
-616,28
+616,28
@@
void CommImpl::finish()
break;
case SIMIX_SRC_TIMEOUT:
- simcall->issuer->exception_ = std::make_exception_ptr(
- simgrid::TimeoutE
rror
(XBT_THROW_POINT, "Communication timeouted because of the sender"));
+ simcall->issuer
_
->exception_ = std::make_exception_ptr(
+ simgrid::TimeoutE
xception
(XBT_THROW_POINT, "Communication timeouted because of the sender"));
break;
case SIMIX_DST_TIMEOUT:
- simcall->issuer->exception_ = std::make_exception_ptr(
- simgrid::TimeoutE
rror
(XBT_THROW_POINT, "Communication timeouted because of the receiver"));
+ simcall->issuer
_
->exception_ = std::make_exception_ptr(
+ simgrid::TimeoutE
xception
(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;
+ 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;
+ 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;
@@
-645,43
+645,44
@@
void CommImpl::finish()
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(
+ 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);
}
@@
-690,26
+691,19
@@
void CommImpl::finish()
// 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);
+ simcall->issuer
_
->waiting_synchro = nullptr;
+ simcall->issuer
_
->comms.remove(this);
if (detached_) {
- if (simcall->issuer == src_actor_) {
+ 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 {
@@
-717,11
+711,6
@@
void CommImpl::finish()
src_actor_->comms.remove(this);
}
}
-
- if (simcall->issuer->get_host()->is_on())
- SIMIX_simcall_answer(simcall);
- else
- simcall->issuer->context_->iwannadie = true;
}
}