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
move kernel timers from simix:: to kernel::timer::
[simgrid.git]
/
src
/
kernel
/
activity
/
ExecImpl.cpp
diff --git
a/src/kernel/activity/ExecImpl.cpp
b/src/kernel/activity/ExecImpl.cpp
index
3553841
..
c1d2583
100644
(file)
--- a/
src/kernel/activity/ExecImpl.cpp
+++ b/
src/kernel/activity/ExecImpl.cpp
@@
-241,7
+241,7
@@
void ExecImpl::wait_any_for(actor::ActorImpl* issuer, const std::vector<ExecImpl
if (timeout < 0.0) {
issuer->simcall_.timeout_cb_ = nullptr;
} else {
if (timeout < 0.0) {
issuer->simcall_.timeout_cb_ = nullptr;
} else {
- issuer->simcall_.timeout_cb_ =
simix
::Timer::set(SIMIX_get_clock() + timeout, [issuer, &execs]() {
+ issuer->simcall_.timeout_cb_ =
timer
::Timer::set(SIMIX_get_clock() + timeout, [issuer, &execs]() {
issuer->simcall_.timeout_cb_ = nullptr;
for (auto* exec : execs)
exec->unregister_simcall(&issuer->simcall_);
issuer->simcall_.timeout_cb_ = nullptr;
for (auto* exec : execs)
exec->unregister_simcall(&issuer->simcall_);