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
use activity cancel, not the action cancel
[simgrid.git]
/
src
/
kernel
/
actor
/
ActorImpl.cpp
diff --git
a/src/kernel/actor/ActorImpl.cpp
b/src/kernel/actor/ActorImpl.cpp
index
3f63777
..
8f78d87
100644
(file)
--- a/
src/kernel/actor/ActorImpl.cpp
+++ b/
src/kernel/actor/ActorImpl.cpp
@@
-217,8
+217,7
@@
void ActorImpl::exit()
if (i != waiting_synchro->simcalls_.end())
waiting_synchro->simcalls_.remove(&simcall);
} else if (sleep != nullptr) {
if (i != waiting_synchro->simcalls_.end())
waiting_synchro->simcalls_.remove(&simcall);
} else if (sleep != nullptr) {
- if (sleep->surf_action_)
- sleep->surf_action_->cancel();
+ sleep->cancel();
sleep->post();
} else if (raw != nullptr) {
raw->finish();
sleep->post();
} else if (raw != nullptr) {
raw->finish();