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
fix SimGrid-FMI
[simgrid.git]
/
src
/
kernel
/
activity
/
SleepImpl.cpp
diff --git
a/src/kernel/activity/SleepImpl.cpp
b/src/kernel/activity/SleepImpl.cpp
index
b5b7a7a
..
8a3eb18
100644
(file)
--- a/
src/kernel/activity/SleepImpl.cpp
+++ b/
src/kernel/activity/SleepImpl.cpp
@@
-42,12
+42,13
@@
void SleepImpl::post()
{
if (surf_action_->get_state() == resource::Action::State::FAILED) {
if (host_ && not host_->is_on())
- state_ = S
IMIX_
SRC_HOST_FAILURE;
+ state_ = S
tate::
SRC_HOST_FAILURE;
else
- state_ = S
IMIX_
CANCELED;
+ state_ = S
tate::
CANCELED;
} else if (surf_action_->get_state() == resource::Action::State::FINISHED) {
- state_ = S
IMIX_
DONE;
+ state_ = S
tate::
DONE;
}
+ /* Answer all simcalls associated with the synchro */
finish();
}
@@
-56,21
+57,14
@@
void SleepImpl::finish()
while (not simcalls_.empty()) {
smx_simcall_t simcall = simcalls_.front();
simcalls_.pop_front();
- if (state_ == SIMIX_SRC_HOST_FAILURE) {
- /* If the host running the synchro failed, notice it. This way, the asking
- * actor can be killed if it runs on that host itself */
- simcall->issuer->context_->iwannadie = true;
- simcall->issuer->exception_ = std::make_exception_ptr(HostFailureException(XBT_THROW_POINT, "Host failed"));
- }
- simcall_process_sleep__set__result(simcall, state_);
- simcall->issuer->waiting_synchro = nullptr;
- if (simcall->issuer->is_suspended()) {
+ simcall->issuer_->waiting_synchro = nullptr;
+ if (simcall->issuer_->is_suspended()) {
XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
- simcall->issuer->suspended_ = false;
- simcall
_HANDLER_process_suspend(simcall, simcall->issuer
);
+ simcall->issuer
_
->suspended_ = false;
+ simcall
->issuer_->suspend(
);
} else {
-
SIMIX_simcall_answer(simcall
);
+
simcall->issuer_->simcall_answer(
);
}
}