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
add Exec::setBound (and what lies beneath)
[simgrid.git]
/
src
/
kernel
/
activity
/
SleepImpl.cpp
diff --git
a/src/kernel/activity/SleepImpl.cpp
b/src/kernel/activity/SleepImpl.cpp
index
6db6d88
..
bc34a78
100644
(file)
--- a/
src/kernel/activity/SleepImpl.cpp
+++ b/
src/kernel/activity/SleepImpl.cpp
@@
-9,7
+9,7
@@
#include "src/kernel/context/Context.hpp"
#include "src/simix/ActorImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/simix/ActorImpl.hpp"
-#include "src/simix/popping_private.h"
+#include "src/simix/popping_private.h
pp
"
#include "src/surf/surf_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
#include "src/surf/surf_interface.hpp"
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
@@
-30,16
+30,15
@@
void simgrid::kernel::activity::SleepImpl::post()
smx_simcall_t simcall = simcalls.front();
simcalls.pop_front();
smx_simcall_t simcall = simcalls.front();
simcalls.pop_front();
- e_smx_state_t
state
;
+ e_smx_state_t
result
;
switch (surf_sleep->getState()) {
case simgrid::surf::Action::State::failed:
simcall->issuer->context->iwannadie = 1;
switch (surf_sleep->getState()) {
case simgrid::surf::Action::State::failed:
simcall->issuer->context->iwannadie = 1;
- // SMX_EXCEPTION(simcall->issuer, host_error, 0, "Host failed");
- state = SIMIX_SRC_HOST_FAILURE;
+ result = SIMIX_SRC_HOST_FAILURE;
break;
case simgrid::surf::Action::State::done:
break;
case simgrid::surf::Action::State::done:
-
state
= SIMIX_DONE;
+
result
= SIMIX_DONE;
break;
default:
break;
default:
@@
-49,7
+48,7
@@
void simgrid::kernel::activity::SleepImpl::post()
if (simcall->issuer->host->isOff()) {
simcall->issuer->context->iwannadie = 1;
}
if (simcall->issuer->host->isOff()) {
simcall->issuer->context->iwannadie = 1;
}
- simcall_process_sleep__set__result(simcall,
state
);
+ simcall_process_sleep__set__result(simcall,
result
);
simcall->issuer->waiting_synchro = nullptr;
if (simcall->issuer->suspended) {
XBT_DEBUG("Wait! This process is suspended and can't wake up now.");
simcall->issuer->waiting_synchro = nullptr;
if (simcall->issuer->suspended) {
XBT_DEBUG("Wait! This process is suspended and can't wake up now.");