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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index
3e02230
..
dbafa01
100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-8,7
+8,7
@@
#include "mc/mc.h"
#include "src/mc/mc_base.h"
#include "src/mc/mc_replay.h"
#include "mc/mc.h"
#include "src/mc/mc_base.h"
#include "src/mc/mc_replay.h"
-#include "src/simix/smx_private.h"
+#include "src/simix/smx_private.h
pp
"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
@@
-97,14
+97,9
@@
bool actor_is_enabled(smx_actor_t actor)
}
case SIMCALL_COMM_WAITANY: {
}
case SIMCALL_COMM_WAITANY: {
- xbt_dynar_t comms;
- simgrid::kernel::activity::CommImpl* act =
- static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
-
- comms = simcall_comm_waitany__get__comms(req);
-
+ xbt_dynar_t comms = simcall_comm_waitany__get__comms(req);
for (unsigned int index = 0; index < comms->used; ++index) {
for (unsigned int index = 0; index < comms->used; ++index) {
- act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*);
+
simgrid::kernel::activity::CommImpl*
act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*);
if (act->src_proc && act->dst_proc)
return true;
}
if (act->src_proc && act->dst_proc)
return true;
}