X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..a2b07e1db97dbd4d8acb6c83de13d2e9449520e1:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index f2a09f48c3..8acb0dd135 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,12 +11,9 @@ #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc, "Logging specific to mc_compare in mc"); -using simgrid::mc::remote; - -namespace simgrid { -namespace mc { +namespace simgrid::mc { /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ @@ -127,8 +124,7 @@ public: void match_equals(const HeapLocationPairs* list); }; -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc /************************************************************************************/ @@ -155,8 +151,7 @@ static bool is_block_stack(const simgrid::mc::RemoteProcess& process, int block) [block](auto const& stack) { return stack.block == block; }); } -namespace simgrid { -namespace mc { +namespace simgrid::mc { void StateComparator::match_equals(const HeapLocationPairs* list) { @@ -820,7 +815,8 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat if (type_size != -1 && type_size != (ssize_t)heapinfo1->busy_block.busy_size && type_size != (ssize_t)heapinfo2->busy_block.busy_size && - (type->name.empty() || type->name == "struct s_smx_context")) { + (type->name.empty() || + type->name == "struct s_smx_context")) { // FIXME: there is no struct s_smx_context anymore if (match_pairs) state.match_equals(previous); return false; @@ -975,19 +971,17 @@ static bool heap_area_differ(const RemoteProcess& process, StateComparator& stat return true; /* Start comparison */ - bool differ = type ? heap_area_differ_with_type(process, state, area1, area2, snapshot1, snapshot2, previous, type, - size, check_ignore, pointer_level) - : heap_area_differ_without_type(process, state, area1, area2, snapshot1, snapshot2, previous, size, - check_ignore); - if (differ) + if (type ? heap_area_differ_with_type(process, state, area1, area2, snapshot1, snapshot2, previous, type, size, + check_ignore, pointer_level) + : heap_area_differ_without_type(process, state, area1, area2, snapshot1, snapshot2, previous, size, + check_ignore)) return true; if (match_pairs) state.match_equals(previous); return false; } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc /************************** Snapshot comparison *******************************/ /******************************************************************************/ @@ -1178,68 +1172,64 @@ static bool local_variables_differ(const simgrid::mc::RemoteProcess& process, si return false; } -namespace simgrid { -namespace mc { +namespace simgrid::mc { -bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) +bool Snapshot::operator==(const Snapshot& other) { // TODO, make this a field of ModelChecker or something similar static StateComparator state_comparator; const RemoteProcess& process = mc_model_checker->get_remote_process(); - if (s1->hash_ != s2->hash_) { - XBT_VERB("(%d - %d) Different hash: 0x%" PRIx64 "--0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_, - s2->hash_); + if (hash_ != other.hash_) { + XBT_VERB("(%ld - %ld) Different hash: 0x%" PRIx64 "--0x%" PRIx64, this->num_state_, other.num_state_, this->hash_, + other.hash_); return false; } - XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_); + XBT_VERB("(%ld - %ld) Same hash: 0x%" PRIx64, this->num_state_, other.num_state_, this->hash_); - /* Compare enabled processes */ - if (s1->enabled_processes_ != s2->enabled_processes_) { - XBT_VERB("(%d - %d) Different amount of enabled processes", s1->num_state_, s2->num_state_); - return false; - } + /* TODO: re-enable the quick filter of counting enabled processes in each snapshots */ /* Compare size of stacks */ - for (unsigned long i = 0; i < s1->stacks_.size(); i++) { - size_t size_used1 = s1->stack_sizes_[i]; - size_t size_used2 = s2->stack_sizes_[i]; + for (unsigned long i = 0; i < this->stacks_.size(); i++) { + size_t size_used1 = this->stack_sizes_[i]; + size_t size_used2 = other.stack_sizes_[i]; if (size_used1 != size_used2) { - XBT_VERB("(%d - %d) Different size used in stacks: %zu - %zu", s1->num_state_, s2->num_state_, size_used1, + XBT_VERB("(%ld - %ld) Different size used in stacks: %zu - %zu", num_state_, other.num_state_, size_used1, size_used2); return false; } } /* Init heap information used in heap comparison algorithm */ - const s_xbt_mheap_t* heap1 = static_cast( - s1->read_bytes(alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), process.heap_address, ReadOptions::lazy())); - const s_xbt_mheap_t* heap2 = static_cast( - s2->read_bytes(alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), process.heap_address, ReadOptions::lazy())); - if (state_comparator.initHeapInformation(heap1, heap2, s1->to_ignore_, s2->to_ignore_) == -1) { - XBT_VERB("(%d - %d) Different heap information", s1->num_state_, s2->num_state_); + const s_xbt_mheap_t* heap1 = static_cast(this->read_bytes( + alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), process.heap_address, ReadOptions::lazy())); + const s_xbt_mheap_t* heap2 = static_cast(other.read_bytes( + alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), process.heap_address, ReadOptions::lazy())); + if (state_comparator.initHeapInformation(heap1, heap2, this->to_ignore_, other.to_ignore_) == -1) { + XBT_VERB("(%ld - %ld) Different heap information", this->num_state_, other.num_state_); return false; } /* Stacks comparison */ - for (unsigned int cursor = 0; cursor < s1->stacks_.size(); cursor++) { - const_mc_snapshot_stack_t stack1 = &s1->stacks_[cursor]; - const_mc_snapshot_stack_t stack2 = &s2->stacks_[cursor]; + for (unsigned int cursor = 0; cursor < this->stacks_.size(); cursor++) { + const_mc_snapshot_stack_t stack1 = &this->stacks_[cursor]; + const_mc_snapshot_stack_t stack2 = &other.stacks_[cursor]; - if (local_variables_differ(process, state_comparator, *s1, *s2, stack1, stack2)) { - XBT_VERB("(%d - %d) Different local variables between stacks %u", s1->num_state_, s2->num_state_, cursor + 1); + if (local_variables_differ(process, state_comparator, *this, other, stack1, stack2)) { + XBT_VERB("(%ld - %ld) Different local variables between stacks %u", this->num_state_, other.num_state_, + cursor + 1); return false; } } - size_t regions_count = s1->snapshot_regions_.size(); - if (regions_count != s2->snapshot_regions_.size()) + size_t regions_count = this->snapshot_regions_.size(); + if (regions_count != other.snapshot_regions_.size()) return false; for (size_t k = 0; k != regions_count; ++k) { - Region* region1 = s1->snapshot_regions_[k].get(); - Region* region2 = s2->snapshot_regions_[k].get(); + Region* region1 = this->snapshot_regions_[k].get(); + Region* region2 = other.snapshot_regions_[k].get(); // Preconditions: if (region1->region_type() != RegionType::Data) @@ -1250,22 +1240,21 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) xbt_assert(region1->object_info()); /* Compare global variables */ - if (global_variables_differ(process, state_comparator, region1->object_info(), region1, region2, *s1, *s2)) { + if (global_variables_differ(process, state_comparator, region1->object_info(), region1, region2, *this, other)) { std::string const& name = region1->object_info()->file_name; - XBT_VERB("(%d - %d) Different global variables in %s", s1->num_state_, s2->num_state_, name.c_str()); + XBT_VERB("(%ld - %ld) Different global variables in %s", this->num_state_, other.num_state_, name.c_str()); return false; } } /* Compare heap */ - if (mmalloc_heap_differ(process, state_comparator, *s1, *s2)) { - XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_); + if (mmalloc_heap_differ(process, state_comparator, *this, other)) { + XBT_VERB("(%ld - %ld) Different heap (mmalloc_compare)", this->num_state_, other.num_state_); return false; } - XBT_VERB("(%d - %d) No difference found", s1->num_state_, s2->num_state_); + XBT_VERB("(%ld - %ld) No difference found", this->num_state_, other.num_state_); return true; } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc