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
add extern "C"
[simgrid.git]
/
src
/
mc
/
mc_compare.cpp
diff --git
a/src/mc/mc_compare.cpp
b/src/mc/mc_compare.cpp
index
ed0d50e
..
dd6dd27
100644
(file)
--- a/
src/mc/mc_compare.cpp
+++ b/
src/mc/mc_compare.cpp
@@
-13,12
+13,12
@@
#include <xbt/sysdep.h>
#include "src/internal_config.h"
#include <xbt/sysdep.h>
#include "src/internal_config.h"
-#include "mc_object_info.h"
-#include "mc_safety.h"
-#include "mc_liveness.h"
-#include "mc_private.h"
-#include "mc_smx.h"
-#include "mc_dwarf.hpp"
+#include "
src/mc/
mc_object_info.h"
+#include "
src/mc/
mc_safety.h"
+#include "
src/mc/
mc_liveness.h"
+#include "
src/mc/
mc_private.h"
+#include "
src/mc/
mc_smx.h"
+#include "
src/mc/
mc_dwarf.hpp"
#include "src/mc/Frame.hpp"
#include "src/mc/ObjectInformation.hpp"
#include "src/mc/Frame.hpp"
#include "src/mc/ObjectInformation.hpp"
@@
-321,7
+321,7
@@
static int compare_local_variables(int process_index,
current_var1 = &stack1->local_variables[cursor];
current_var2 = &stack1->local_variables[cursor];
if (current_var1->name != current_var2->name
current_var1 = &stack1->local_variables[cursor];
current_var2 = &stack1->local_variables[cursor];
if (current_var1->name != current_var2->name
- || current_var1->subprogram != current_var
1
->subprogram
+ || current_var1->subprogram != current_var
2
->subprogram
|| current_var1->ip != current_var2->ip) {
// TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
XBT_VERB
|| current_var1->ip != current_var2->ip) {
// TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
XBT_VERB
@@
-440,11
+440,11
@@
int snapshot_compare(void *state1, void *state2)
xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes(
alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
remote(process->heap_address),
xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes(
alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
remote(process->heap_address),
- simgrid::mc::ProcessIndexMissing, simgrid::mc::
AddressSpace::Lazy
);
+ simgrid::mc::ProcessIndexMissing, simgrid::mc::
ReadOptions::lazy()
);
xbt_mheap_t heap2 = (xbt_mheap_t)s2->read_bytes(
alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
remote(process->heap_address),
xbt_mheap_t heap2 = (xbt_mheap_t)s2->read_bytes(
alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
remote(process->heap_address),
- simgrid::mc::ProcessIndexMissing, simgrid::mc::
AddressSpace::Lazy
);
+ simgrid::mc::ProcessIndexMissing, simgrid::mc::
ReadOptions::lazy()
);
res_init = init_heap_information(heap1, heap2, &s1->to_ignore, &s2->to_ignore);
if (res_init == -1) {
#ifdef MC_DEBUG
res_init = init_heap_information(heap1, heap2, &s1->to_ignore, &s2->to_ignore);
if (res_init == -1) {
#ifdef MC_DEBUG
@@
-469,7
+469,7
@@
int snapshot_compare(void *state1, void *state2)
mc_snapshot_stack_t stack1, stack2;
while (cursor < s1->stacks.size()) {
stack1 = &s1->stacks[cursor];
mc_snapshot_stack_t stack1, stack2;
while (cursor < s1->stacks.size()) {
stack1 = &s1->stacks[cursor];
- stack2 = &s
1
->stacks[cursor];
+ stack2 = &s
2
->stacks[cursor];
if (stack1->process_index != stack2->process_index) {
diff_local = 1;
if (stack1->process_index != stack2->process_index) {
diff_local = 1;
@@
-520,7
+520,8
@@
int snapshot_compare(void *state1, void *state2)
/* Compare global variables */
is_diff =
/* Compare global variables */
is_diff =
- compare_global_variables(region1->object_info( ), simgrid::mc::AddressSpace::Normal,
+ compare_global_variables(region1->object_info(),
+ simgrid::mc::ProcessIndexDisabled,
region1, region2,
s1, s2);
region1, region2,
s1, s2);