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' into mc
[simgrid.git]
/
src
/
mc
/
mc_compare.c
diff --git
a/src/mc/mc_compare.c
b/src/mc/mc_compare.c
index
5a6eb58
..
bf8dac4
100644
(file)
--- a/
src/mc/mc_compare.c
+++ b/
src/mc/mc_compare.c
@@
-9,6
+9,7
@@
#include "mc_private.h"
#include "xbt/mmalloc.h"
#include "mc_private.h"
#include "xbt/mmalloc.h"
+#include "xbt/mmalloc/mmprivate.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc,
"Logging specific to mc_compare");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc,
"Logging specific to mc_compare");
@@
-179,10
+180,10
@@
static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snaps
// * a pointer leads to the read-only segment of the current object;
// * a pointer lead to a different ELF object.
// * a pointer leads to the read-only segment of the current object;
// * a pointer lead to a different ELF object.
- // The pointers are both in the heap:
- if(addr_pointed1 > std_heap && (char *)addr_pointed1 < (char*) std_heap + STD_HEAP_SIZE){
- if(!(addr_pointed2 > std_heap && (char *)addr_pointed2 < (char*) std_heap + STD_HEAP_SIZE))
+ if(addr_pointed1 > std_heap && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)){
+ if(!(addr_pointed2 > std_heap && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)))
return 1;
return 1;
+ // The pointers are both in the heap:
return compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, snapshot2, NULL, type->subtype, pointer_level);
}
return compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, snapshot2, NULL, type->subtype, pointer_level);
}
@@
-453,7
+454,9
@@
int snapshot_compare(void *state1, void *state2){
/* Stacks comparison */
unsigned int cursor = 0;
int diff_local = 0;
/* Stacks comparison */
unsigned int cursor = 0;
int diff_local = 0;
+#ifdef MC_DEBUG
is_diff = 0;
is_diff = 0;
+#endif
mc_snapshot_stack_t stack1, stack2;
while(cursor < xbt_dynar_length(s1->stacks)){
mc_snapshot_stack_t stack1, stack2;
while(cursor < xbt_dynar_length(s1->stacks)){