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 Simcall from namespace simix to kernel::actor.
[simgrid.git]
/
src
/
kernel
/
activity
/
IoImpl.cpp
diff --git
a/src/kernel/activity/IoImpl.cpp
b/src/kernel/activity/IoImpl.cpp
index
d910ac9
..
07dff0f
100644
(file)
--- a/
src/kernel/activity/IoImpl.cpp
+++ b/
src/kernel/activity/IoImpl.cpp
@@
-138,14
+138,14
@@
void IoImpl::finish()
{
XBT_DEBUG("IoImpl::finish() in state %s", get_state_str());
while (not simcalls_.empty()) {
-
simix
::Simcall* simcall = simcalls_.front();
+
actor
::Simcall* simcall = simcalls_.front();
simcalls_.pop_front();
/* If a waitany simcall is waiting for this synchro to finish, then remove it from the other synchros in the waitany
* 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_ ==
simix
::Simcall::Type::NONE) // FIXME: maybe a better way to handle this case
+ if (simcall->call_ ==
actor
::Simcall::Type::NONE) // FIXME: maybe a better way to handle this case
continue; // if process handling comm is killed
handle_activity_waitany(simcall);