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] Move heap_ignore to Process
[simgrid.git]
/
src
/
mc
/
mc_checkpoint.cpp
diff --git
a/src/mc/mc_checkpoint.cpp
b/src/mc/mc_checkpoint.cpp
index
97ca4ec
..
6bafeae
100644
(file)
--- a/
src/mc/mc_checkpoint.cpp
+++ b/
src/mc/mc_checkpoint.cpp
@@
-417,32
+417,28
@@
static std::vector<s_mc_snapshot_stack_t> MC_take_snapshot_stacks(mc_snapshot_t
{
std::vector<s_mc_snapshot_stack_t> res;
- unsigned int cursor = 0;
- stack_region_t current_stack;
-
- // FIXME, cross-process support (stack_areas)
- xbt_dynar_foreach(stacks_areas, cursor, current_stack) {
+ for (auto const& stack : mc_model_checker->process().stack_areas()) {
s_mc_snapshot_stack_t st;
// Read the context from remote process:
unw_context_t context;
mc_model_checker->process().read_bytes(
- &context, sizeof(context), remote(
current_stack->
context));
+ &context, sizeof(context), remote(
stack.
context));
if (mc_unw_init_context(&st.context, &mc_model_checker->process(),
&context) < 0) {
xbt_die("Could not initialise the libunwind context.");
}
st.stack_frames = MC_unwind_stack_frames(&st.context);
- st.local_variables = MC_get_local_variables_values(st.stack_frames,
current_stack->
process_index);
- st.process_index =
current_stack->
process_index;
+ st.local_variables = MC_get_local_variables_values(st.stack_frames,
stack.
process_index);
+ st.process_index =
stack.
process_index;
unw_word_t sp = st.stack_frames[0].sp;
res.push_back(std::move(st));
size_t stack_size =
- (char*)
current_stack->address + current_stack->
size - (char*) sp;
+ (char*)
stack.address + stack.
size - (char*) sp;
(*snapshot)->stack_sizes.push_back(stack_size);
}
@@
-450,28
+446,6
@@
static std::vector<s_mc_snapshot_stack_t> MC_take_snapshot_stacks(mc_snapshot_t
}
-static std::vector<s_mc_heap_ignore_region_t> MC_take_snapshot_ignore()
-{
- std::vector<s_mc_heap_ignore_region_t> res;
-
- if (mc_heap_comparison_ignore == NULL)
- return std::move(res);
-
- unsigned int cursor = 0;
- mc_heap_ignore_region_t current_region;
-
- xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region) {
- s_mc_heap_ignore_region_t new_region;
- new_region.address = current_region->address;
- new_region.size = current_region->size;
- new_region.block = current_region->block;
- new_region.fragment = current_region->fragment;
- res.push_back(std::move(new_region));
- }
-
- return std::move(res);
-}
-
static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
{
xbt_assert(snapshot->process());
@@
-608,7
+582,7
@@
mc_snapshot_t MC_take_snapshot(int num_state)
if (use_soft_dirty)
mc_process->reset_soft_dirty();
- snapshot->to_ignore =
MC_take_snapshot_ignore
();
+ snapshot->to_ignore =
mc_model_checker->process().ignored_heap
();
if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) {
snapshot->stacks =