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
[mc] Read smpi_process_count() from remote process
[simgrid.git]
/
src
/
mc
/
mc_compare.cpp
diff --git
a/src/mc/mc_compare.cpp
b/src/mc/mc_compare.cpp
index
5b6352a
..
3420b02
100644
(file)
--- a/
src/mc/mc_compare.cpp
+++ b/
src/mc/mc_compare.cpp
@@
-13,6
+13,7
@@
#include "mc_safety.h"
#include "mc_liveness.h"
#include "mc_private.h"
#include "mc_safety.h"
#include "mc_liveness.h"
#include "mc_private.h"
+#include "mc_smx.h"
#ifdef HAVE_SMPI
#include "smpi/private.h"
#ifdef HAVE_SMPI
#include "smpi/private.h"
@@
-269,7
+270,7
@@
static int compare_global_variables(mc_object_info_t object_info,
return 1;
}
return 1;
}
- size_t process_count = smpi_process_count();
+ size_t process_count =
MC_
smpi_process_count();
xbt_assert(process_count == r1->privatized.regions_count
&& process_count == r2->privatized.regions_count);
xbt_assert(process_count == r1->privatized.regions_count
&& process_count == r2->privatized.regions_count);
@@
-394,6
+395,11
@@
int snapshot_compare(void *state1, void *state2)
s2 = ((mc_visited_pair_t) state2)->graph_state->system_state;
num1 = ((mc_visited_pair_t) state1)->num;
num2 = ((mc_visited_pair_t) state2)->num;
s2 = ((mc_visited_pair_t) state2)->graph_state->system_state;
num1 = ((mc_visited_pair_t) state1)->num;
num2 = ((mc_visited_pair_t) state2)->num;
+ }else if (_sg_mc_termination) { /* Non-progressive cycle MC */
+ s1 = ((mc_state_t) state1)->system_state;
+ s2 = ((mc_state_t) state2)->system_state;
+ num1 = ((mc_state_t) state1)->num;
+ num2 = ((mc_state_t) state2)->num;
} else { /* Safety or comm determinism MC */
s1 = ((mc_visited_state_t) state1)->system_state;
s2 = ((mc_visited_state_t) state2)->system_state;
} else { /* Safety or comm determinism MC */
s1 = ((mc_visited_state_t) state1)->system_state;
s2 = ((mc_visited_state_t) state2)->system_state;