-/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2021. 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. */
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_smx.hpp"
#include "src/mc/sosp/Snapshot.hpp"
+#include <algorithm>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc");
using simgrid::mc::remote;
}
};
-typedef std::array<HeapLocation, 2> HeapLocationPair;
-typedef std::set<HeapLocationPair> HeapLocationPairs;
+using HeapLocationPair = std::array<HeapLocation, 2>;
+using HeapLocationPairs = std::set<HeapLocationPair>;
class HeapArea : public HeapLocation {
public:
std::vector<Type*> types;
std::size_t heapsize = 0;
- void initHeapInformation(xbt_mheap_t heap, const std::vector<IgnoredHeapRegion>& i);
+ void initHeapInformation(const s_xbt_mheap_t* heap, const std::vector<IgnoredHeapRegion>& i);
};
class StateComparator {
compared_pointers.clear();
}
- int initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, const std::vector<IgnoredHeapRegion>& i1,
- const std::vector<IgnoredHeapRegion>& i2);
+ int initHeapInformation(const s_xbt_mheap_t* heap1, const s_xbt_mheap_t* heap2,
+ const std::vector<IgnoredHeapRegion>& i1, const std::vector<IgnoredHeapRegion>& i2);
template <int rank> HeapArea& equals_to_(std::size_t i, std::size_t j)
{
this->equals_to_<2>(b2, f2).block_ == b1 && this->equals_to_<2>(b2, f2).fragment_ == f1;
}
- void match_equals(HeapLocationPairs* list);
+ void match_equals(const HeapLocationPairs* list);
};
} // namespace mc
static ssize_t heap_comparison_ignore_size(const std::vector<simgrid::mc::IgnoredHeapRegion>* ignore_list,
const void* address)
{
- int start = 0;
- int end = ignore_list->size() - 1;
-
- while (start <= end) {
- unsigned int cursor = (start + end) / 2;
- simgrid::mc::IgnoredHeapRegion const& region = (*ignore_list)[cursor];
- if (region.address == address)
- return region.size;
- if (region.address < address)
- start = cursor + 1;
- if (region.address > address)
- end = cursor - 1;
- }
-
- return -1;
+ auto pos = std::lower_bound(ignore_list->begin(), ignore_list->end(), address,
+ [](auto const& reg, auto const* addr) { return reg.address < addr; });
+ return (pos != ignore_list->end() && pos->address == address) ? pos->size : -1;
}
-static bool is_stack(const void *address)
+static bool is_stack(const simgrid::mc::RemoteProcess& process, const void* address)
{
- for (auto const& stack : mc_model_checker->process().stack_areas())
- if (address == stack.address)
- return true;
- return false;
+ auto const& stack_areas = process.stack_areas();
+ return std::any_of(stack_areas.begin(), stack_areas.end(),
+ [address](auto const& stack) { return stack.address == address; });
}
// TODO, this should depend on the snapshot?
-static bool is_block_stack(int block)
+static bool is_block_stack(const simgrid::mc::RemoteProcess& process, int block)
{
- for (auto const& stack : mc_model_checker->process().stack_areas())
- if (block == stack.block)
- return true;
- return false;
+ auto const& stack_areas = process.stack_areas();
+ return std::any_of(stack_areas.begin(), stack_areas.end(),
+ [block](auto const& stack) { return stack.block == block; });
}
namespace simgrid {
namespace mc {
-void StateComparator::match_equals(HeapLocationPairs* list)
+void StateComparator::match_equals(const HeapLocationPairs* list)
{
for (auto const& pair : *list) {
if (pair[0].fragment_ != -1) {
}
}
-void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, const std::vector<IgnoredHeapRegion>& i)
+void ProcessComparisonState::initHeapInformation(const s_xbt_mheap_t* heap, const std::vector<IgnoredHeapRegion>& i)
{
auto heaplimit = heap->heaplimit;
this->heapsize = heap->heapsize;
this->types.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, nullptr);
}
-int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, const std::vector<IgnoredHeapRegion>& i1,
+int StateComparator::initHeapInformation(const s_xbt_mheap_t* heap1, const s_xbt_mheap_t* heap2,
+ const std::vector<IgnoredHeapRegion>& i1,
const std::vector<IgnoredHeapRegion>& i2)
{
if ((heap1->heaplimit != heap2->heaplimit) || (heap1->heapsize != heap2->heapsize))
return -1;
this->heaplimit = heap1->heaplimit;
- this->std_heap_copy = *mc_model_checker->process().get_heap();
+ this->std_heap_copy = *mc_model_checker->get_remote_process().get_heap();
this->processStates[0].initHeapInformation(heap1, i1);
this->processStates[1].initHeapInformation(heap2, i2);
return 0;
xbt_die("No heap region");
}
-static bool heap_area_differ(StateComparator& state, const void* area1, const void* area2, const Snapshot& snapshot1,
- const Snapshot& snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level);
+static bool heap_area_differ(const RemoteProcess& process, StateComparator& state, const void* area1, const void* area2,
+ const Snapshot& snapshot1, const Snapshot& snapshot2, HeapLocationPairs* previous,
+ Type* type, int pointer_level);
-static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot1, const Snapshot& snapshot2)
+static bool mmalloc_heap_differ(const RemoteProcess& process, StateComparator& state, const Snapshot& snapshot1,
+ const Snapshot& snapshot2)
{
- const RemoteClient& process = mc_model_checker->process();
-
/* Check busy blocks */
size_t i1 = 1;
malloc_info heapinfo_temp2;
malloc_info heapinfo_temp2b;
- Region* heap_region1 = MC_get_heap_region(snapshot1);
- Region* heap_region2 = MC_get_heap_region(snapshot2);
+ const Region* heap_region1 = MC_get_heap_region(snapshot1);
+ const Region* heap_region2 = MC_get_heap_region(snapshot2);
// This is the address of std_heap->heapinfo in the application process:
- void* heapinfo_address = &((xbt_mheap_t)process.heap_address)->heapinfo;
+ uint64_t heapinfo_address = process.heap_address.address() + offsetof(s_xbt_mheap_t, heapinfo);
// This is in snapshot do not use them directly:
- const malloc_info* heapinfos1 =
- snapshot1.read<malloc_info*>(RemotePtr<malloc_info*>((std::uint64_t)heapinfo_address));
- const malloc_info* heapinfos2 =
- snapshot2.read<malloc_info*>(RemotePtr<malloc_info*>((std::uint64_t)heapinfo_address));
+ const malloc_info* heapinfos1 = snapshot1.read(remote<malloc_info*>(heapinfo_address));
+ const malloc_info* heapinfos2 = snapshot2.read(remote<malloc_info*>(heapinfo_address));
while (i1 < state.heaplimit) {
- const malloc_info* heapinfo1 =
- (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info));
- const malloc_info* heapinfo2 =
- (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[i1], sizeof(malloc_info));
+ const auto* heapinfo1 =
+ static_cast<malloc_info*>(heap_region1->read(&heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info)));
+ const auto* heapinfo2 =
+ static_cast<malloc_info*>(heap_region2->read(&heapinfo_temp2, &heapinfos2[i1], sizeof(malloc_info)));
if (heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type == MMALLOC_TYPE_HEAPINFO) { /* Free block */
i1 ++;
continue;
}
- xbt_assert(heapinfo1->type >= 0, "Unkown mmalloc block type: %d", heapinfo1->type);
+ xbt_assert(heapinfo1->type >= 0, "Unknown mmalloc block type: %d", heapinfo1->type);
- void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase));
+ void* addr_block1 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */
- if (is_stack(addr_block1)) {
+ if (is_stack(process, addr_block1)) {
for (size_t k = 0; k < heapinfo1->busy_block.size; k++)
state.equals_to_<1>(i1 + k, 0) = HeapArea(i1, -1);
for (size_t k = 0; k < heapinfo2->busy_block.size; k++)
/* Try first to associate to same block in the other heap */
if (heapinfo2->type == heapinfo1->type && state.equals_to_<2>(i1, 0).valid_ == 0) {
- void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
- if (not heap_area_differ(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) {
+ const void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
+ if (not heap_area_differ(process, state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) {
for (size_t k = 1; k < heapinfo2->busy_block.size; k++)
state.equals_to_<2>(i1 + k, 0) = HeapArea(i1, -1);
for (size_t k = 1; k < heapinfo1->busy_block.size; k++)
}
while (i2 < state.heaplimit && not equal) {
- void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
+ const void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
if (i2 == i1) {
i2++;
continue;
}
- const malloc_info* heapinfo2b =
- (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info));
+ const auto* heapinfo2b =
+ static_cast<malloc_info*>(heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)));
if (heapinfo2b->type != MMALLOC_TYPE_UNFRAGMENTED) {
i2++;
continue;
}
- if (not heap_area_differ(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) {
+ if (not heap_area_differ(process, state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) {
for (size_t k = 1; k < heapinfo2b->busy_block.size; k++)
state.equals_to_<2>(i2 + k, 0) = HeapArea(i1, -1);
for (size_t k = 1; k < heapinfo1->busy_block.size; k++)
if (state.equals_to_<1>(i1, j1).valid_)
continue;
- void* addr_frag1 = (void*)((char*)addr_block1 + (j1 << heapinfo1->type));
+ void* addr_frag1 = (char*)addr_block1 + (j1 << heapinfo1->type);
size_t i2 = 1;
bool equal = false;
/* Try first to associate to same fragment_ in the other heap */
if (heapinfo2->type == heapinfo1->type && not state.equals_to_<2>(i1, j1).valid_) {
- void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
- void* addr_frag2 = (void*)((char*)addr_block2 + (j1 << heapinfo2->type));
- if (not heap_area_differ(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0))
+ const void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
+ const void* addr_frag2 = (const char*)addr_block2 + (j1 << heapinfo2->type);
+ if (not heap_area_differ(process, state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0))
equal = true;
}
while (i2 < state.heaplimit && not equal) {
- const malloc_info* heapinfo2b =
- (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info));
+ const auto* heapinfo2b =
+ static_cast<malloc_info*>(heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)));
if (heapinfo2b->type == MMALLOC_TYPE_FREE || heapinfo2b->type == MMALLOC_TYPE_HEAPINFO) {
i2 ++;
continue;
}
- xbt_assert(heapinfo2b->type >= 0, "Unkown mmalloc block type: %d", heapinfo2b->type);
+ xbt_assert(heapinfo2b->type >= 0, "Unknown mmalloc block type: %d", heapinfo2b->type);
for (size_t j2 = 0; j2 < (size_t)(BLOCKSIZE >> heapinfo2b->type); j2++) {
if (i2 == i1 && j2 == j1)
if (state.equals_to_<2>(i2, j2).valid_)
continue;
- void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
- void* addr_frag2 = (void*)((char*)addr_block2 + (j2 << heapinfo2b->type));
+ const void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
+ const void* addr_frag2 = (const char*)addr_block2 + (j2 << heapinfo2b->type);
- if (not heap_area_differ(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0)) {
+ if (not heap_area_differ(process, state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr,
+ 0)) {
equal = true;
break;
}
/* All blocks/fragments are equal to another block/fragment_ ? */
for (size_t i = 1; i < state.heaplimit; i++) {
- const malloc_info* heapinfo1 =
- (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info));
+ const auto* heapinfo1 =
+ static_cast<malloc_info*>(heap_region1->read(&heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info)));
if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo1->busy_block.busy_size > 0 &&
not state.equals_to_<1>(i, 0).valid_) {
}
for (size_t i = 1; i < state.heaplimit; i++) {
- const malloc_info* heapinfo2 =
- (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info));
+ const auto* heapinfo2 =
+ static_cast<malloc_info*>(heap_region2->read(&heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info)));
if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo2->busy_block.busy_size > 0 &&
not state.equals_to_<2>(i, 0).valid_) {
XBT_DEBUG("Block %zu not found (size used = %zu)", i,
* @param check_ignore
* @return true when different, false otherwise (same or unknown)
*/
-static bool heap_area_differ_without_type(StateComparator& state, const void* real_area1, const void* real_area2,
- const Snapshot& snapshot1, const Snapshot& snapshot2,
+static bool heap_area_differ_without_type(const RemoteProcess& process, StateComparator& state, const void* real_area1,
+ const void* real_area2, const Snapshot& snapshot1, const Snapshot& snapshot2,
HeapLocationPairs* previous, int size, int check_ignore)
{
- const RemoteClient& process = mc_model_checker->process();
- Region* heap_region1 = MC_get_heap_region(snapshot1);
- Region* heap_region2 = MC_get_heap_region(snapshot2);
+ const Region* heap_region1 = MC_get_heap_region(snapshot1);
+ const Region* heap_region2 = MC_get_heap_region(snapshot2);
for (int i = 0; i < size; ) {
if (check_ignore > 0) {
if (snapshot1.on_heap(addr_pointed1) && snapshot2.on_heap(addr_pointed2)) {
// Both addresses are in the heap:
- if (heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0))
+ if (heap_area_differ(process, state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0))
return true;
i = pointer_align + sizeof(void *);
continue;
* @param pointer_level
* @return true when different, false otherwise (same or unknown)
*/
-static bool heap_area_differ_with_type(StateComparator& state, const void* real_area1, const void* real_area2,
- const Snapshot& snapshot1, const Snapshot& snapshot2,
- HeapLocationPairs* previous, Type* type, int area_size, int check_ignore,
- int pointer_level)
+static bool heap_area_differ_with_type(const simgrid::mc::RemoteProcess& process, StateComparator& state,
+ const void* real_area1, const void* real_area2, const Snapshot& snapshot1,
+ const Snapshot& snapshot2, HeapLocationPairs* previous, const Type* type,
+ int area_size, int check_ignore, int pointer_level)
{
// HACK: This should not happen but in practice, there are some
// DW_TAG_typedef without an associated DW_AT_type:
if (type == nullptr)
return false;
- if (is_stack(real_area1) && is_stack(real_area2))
+ if (is_stack(process, real_area1) && is_stack(process, real_area2))
return false;
if (check_ignore > 0) {
return false;
}
- Type* subtype;
- Type* subsubtype;
+ const Type* subtype;
+ const Type* subsubtype;
int elm_size;
const void* addr_pointed1;
const void* addr_pointed2;
- Region* heap_region1 = MC_get_heap_region(snapshot1);
- Region* heap_region2 = MC_get_heap_region(snapshot2);
+ const Region* heap_region1 = MC_get_heap_region(snapshot1);
+ const Region* heap_region2 = MC_get_heap_region(snapshot2);
switch (type->type) {
case DW_TAG_unspecified_type:
case DW_TAG_typedef:
case DW_TAG_const_type:
case DW_TAG_volatile_type:
- return heap_area_differ_with_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, type->subtype,
- area_size, check_ignore, pointer_level);
+ return heap_area_differ_with_type(process, state, real_area1, real_area2, snapshot1, snapshot2, previous,
+ type->subtype, area_size, check_ignore, pointer_level);
case DW_TAG_array_type:
subtype = type->subtype;
}
for (int i = 0; i < type->element_count; i++) {
// TODO, add support for variable stride (DW_AT_byte_stride)
- if (heap_area_differ_with_type(state, (const char*)real_area1 + (i * elm_size),
+ if (heap_area_differ_with_type(process, state, (const char*)real_area1 + (i * elm_size),
(const char*)real_area2 + (i * elm_size), snapshot1, snapshot2, previous,
type->subtype, subtype->byte_size, check_ignore, pointer_level))
return true;
addr_pointed1 = snapshot1.read(remote((void* const*)real_area1));
addr_pointed2 = snapshot2.read(remote((void* const*)real_area2));
if (snapshot1.on_heap(addr_pointed1) && snapshot2.on_heap(addr_pointed2))
- return heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
- pointer_level);
+ return heap_area_differ(process, state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous,
+ type->subtype, pointer_level);
else
return (addr_pointed1 != addr_pointed2);
}
addr_pointed1 = snapshot1.read(remote((void* const*)((const char*)real_area1 + i * sizeof(void*))));
addr_pointed2 = snapshot2.read(remote((void* const*)((const char*)real_area2 + i * sizeof(void*))));
bool differ = snapshot1.on_heap(addr_pointed1) && snapshot2.on_heap(addr_pointed2)
- ? heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous,
- type->subtype, pointer_level)
- : addr_pointed1 != addr_pointed2;
+ ? heap_area_differ(process, state, addr_pointed1, addr_pointed2, snapshot1, snapshot2,
+ previous, type->subtype, pointer_level)
+ : addr_pointed1 != addr_pointed2;
if (differ)
return true;
}
if (area_size <= type->byte_size || area_size % type->byte_size != 0)
return false;
for (size_t i = 0; i < (size_t)(area_size / type->byte_size); i++) {
- if (heap_area_differ_with_type(state, (const char*)real_area1 + i * type->byte_size,
+ if (heap_area_differ_with_type(process, state, (const char*)real_area1 + i * type->byte_size,
(const char*)real_area2 + i * type->byte_size, snapshot1, snapshot2, previous,
type, -1, check_ignore, 0))
return true;
}
} else {
- for (simgrid::mc::Member& member : type->members) {
+ for (const simgrid::mc::Member& member : type->members) {
// TODO, optimize this? (for the offset case)
- void* real_member1 = dwarf::resolve_member(real_area1, type, &member, &snapshot1);
- void* real_member2 = dwarf::resolve_member(real_area2, type, &member, &snapshot2);
- if (heap_area_differ_with_type(state, real_member1, real_member2, snapshot1, snapshot2, previous,
+ const void* real_member1 = dwarf::resolve_member(real_area1, type, &member, &snapshot1);
+ const void* real_member2 = dwarf::resolve_member(real_area2, type, &member, &snapshot2);
+ if (heap_area_differ_with_type(process, state, real_member1, real_member2, snapshot1, snapshot2, previous,
member.type, -1, check_ignore, 0))
return true;
}
return false;
case DW_TAG_union_type:
- return heap_area_differ_without_type(state, real_area1, real_area2, snapshot1, snapshot2, previous,
+ return heap_area_differ_without_type(process, state, real_area1, real_area2, snapshot1, snapshot2, previous,
type->byte_size, check_ignore);
default:
return nullptr;
}
- for (simgrid::mc::Member& member : type->members) {
+ for (const simgrid::mc::Member& member : type->members) {
if (member.has_offset_location()) {
// We have the offset, use it directly (shortcut):
if (member.offset() == offset)
* @param pointer_level
* @return true when different, false otherwise (same or unknown)
*/
-static bool heap_area_differ(StateComparator& state, const void* area1, const void* area2, const Snapshot& snapshot1,
- const Snapshot& snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level)
+static bool heap_area_differ(const RemoteProcess& process, StateComparator& state, const void* area1, const void* area2,
+ const Snapshot& snapshot1, const Snapshot& snapshot2, HeapLocationPairs* previous,
+ Type* type, int pointer_level)
{
- const simgrid::mc::RemoteClient& process = mc_model_checker->process();
-
ssize_t block1;
ssize_t block2;
ssize_t size;
int new_size2 = -1;
Type* new_type1 = nullptr;
- Type* new_type2 = nullptr;
bool match_pairs = false;
// This is the address of std_heap->heapinfo in the application process:
- void* heapinfo_address = &((xbt_mheap_t)process.heap_address)->heapinfo;
+ uint64_t heapinfo_address = process.heap_address.address() + offsetof(s_xbt_mheap_t, heapinfo);
- const malloc_info* heapinfos1 = snapshot1.read(remote((const malloc_info**)heapinfo_address));
- const malloc_info* heapinfos2 = snapshot2.read(remote((const malloc_info**)heapinfo_address));
+ const malloc_info* heapinfos1 = snapshot1.read(remote<malloc_info*>(heapinfo_address));
+ const malloc_info* heapinfos2 = snapshot2.read(remote<malloc_info*>(heapinfo_address));
malloc_info heapinfo_temp1;
malloc_info heapinfo_temp2;
}
// Get block number:
- block1 = ((char*)area1 - (char*)state.std_heap_copy.heapbase) / BLOCKSIZE + 1;
- block2 = ((char*)area2 - (char*)state.std_heap_copy.heapbase) / BLOCKSIZE + 1;
+ block1 = ((const char*)area1 - (const char*)state.std_heap_copy.heapbase) / BLOCKSIZE + 1;
+ block2 = ((const char*)area2 - (const char*)state.std_heap_copy.heapbase) / BLOCKSIZE + 1;
// If either block is a stack block:
- if (is_block_stack((int) block1) && is_block_stack((int) block2)) {
+ if (is_block_stack(process, (int)block1) && is_block_stack(process, (int)block2)) {
previous->insert(HeapLocationPair{{HeapLocation(block1, -1), HeapLocation(block2, -1)}});
if (match_pairs)
state.match_equals(previous);
}
// If either block is not in the expected area of memory:
- if (((char*)area1 < (char*)state.std_heap_copy.heapbase) || (block1 > (ssize_t)state.processStates[0].heapsize) ||
- (block1 < 1) || ((char*)area2 < (char*)state.std_heap_copy.heapbase) ||
+ if (((const char*)area1 < (const char*)state.std_heap_copy.heapbase) ||
+ (block1 > (ssize_t)state.processStates[0].heapsize) || (block1 < 1) ||
+ ((const char*)area2 < (const char*)state.std_heap_copy.heapbase) ||
(block2 > (ssize_t)state.processStates[1].heapsize) || (block2 < 1)) {
return true;
}
type_size = type->byte_size;
}
- simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1);
- simgrid::mc::Region* heap_region2 = MC_get_heap_region(snapshot2);
+ const Region* heap_region1 = MC_get_heap_region(snapshot1);
+ const Region* heap_region2 = MC_get_heap_region(snapshot2);
- const malloc_info* heapinfo1 =
- (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info));
- const malloc_info* heapinfo2 =
- (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[block2], sizeof(malloc_info));
+ const auto* heapinfo1 =
+ static_cast<malloc_info*>(heap_region1->read(&heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info)));
+ const auto* heapinfo2 =
+ static_cast<malloc_info*>(heap_region2->read(&heapinfo_temp2, &heapinfos2[block2], sizeof(malloc_info)));
if ((heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type==MMALLOC_TYPE_HEAPINFO)
&& (heapinfo2->type == MMALLOC_TYPE_FREE || heapinfo2->type ==MMALLOC_TYPE_HEAPINFO)) {
} else if ((heapinfo1->type > 0) && (heapinfo2->type > 0)) { /* Fragmented block */
// Fragment number:
- ssize_t frag1 = ((uintptr_t)(ADDR2UINT(area1) % (BLOCKSIZE))) >> heapinfo1->type;
- ssize_t frag2 = ((uintptr_t)(ADDR2UINT(area2) % (BLOCKSIZE))) >> heapinfo2->type;
+ ssize_t frag1 = (ADDR2UINT(area1) % BLOCKSIZE) >> heapinfo1->type;
+ ssize_t frag2 = (ADDR2UINT(area2) % BLOCKSIZE) >> heapinfo2->type;
// Process address of the fragment_:
- void* real_addr_frag1 = (void*)((char*)real_addr_block1 + (frag1 << heapinfo1->type));
- void* real_addr_frag2 = (void*)((char*)real_addr_block2 + (frag2 << heapinfo2->type));
+ void* real_addr_frag1 = (char*)real_addr_block1 + (frag1 << heapinfo1->type);
+ void* real_addr_frag2 = (char*)real_addr_block2 + (frag2 << heapinfo2->type);
// Check the size of the fragments against the size of the type:
if (type_size != -1) {
}
// Check if the blocks are already matched together:
- if (state.equals_to_<1>(block1, frag1).valid_ && state.equals_to_<2>(block2, frag2).valid_ && offset1 == offset2 &&
+ if (state.equals_to_<1>(block1, frag1).valid_ && state.equals_to_<2>(block2, frag2).valid_ &&
state.fragmentsEqual(block1, frag1, block2, frag2)) {
if (match_pairs)
state.match_equals(previous);
// The type of the variable is already known:
if (type) {
- new_type1 = new_type2 = type;
+ new_type1 = type;
}
// Type inference from the block type.
else if (state.types_<1>(block1, frag1) != nullptr || state.types_<2>(block2, frag2) != nullptr) {
- offset1 = (char*)area1 - (char*)real_addr_frag1;
- offset2 = (char*)area2 - (char*)real_addr_frag2;
+ Type* new_type2 = nullptr;
+
+ offset1 = (const char*)area1 - (const char*)real_addr_frag1;
+ offset2 = (const char*)area2 - (const char*)real_addr_frag2;
if (state.types_<1>(block1, frag1) != nullptr && state.types_<2>(block2, frag2) != nullptr) {
new_type1 = get_offset_type(real_addr_frag1, state.types_<1>(block1, frag1), offset1, size, snapshot1);
return true;
/* Start comparison */
- bool differ =
- type ? heap_area_differ_with_type(state, area1, area2, snapshot1, snapshot2, previous, type, size, check_ignore,
- pointer_level)
- : heap_area_differ_without_type(state, area1, area2, snapshot1, snapshot2, previous, size, check_ignore);
+ 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)
return true;
/************************** Snapshot comparison *******************************/
/******************************************************************************/
-static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
- const simgrid::mc::Snapshot& snapshot1, simgrid::mc::Region* region1,
- const void* real_area2, const simgrid::mc::Snapshot& snapshot2,
- simgrid::mc::Region* region2, simgrid::mc::Type* type, int pointer_level)
+static bool areas_differ_with_type(const simgrid::mc::RemoteProcess& process, simgrid::mc::StateComparator& state,
+ const void* real_area1, const simgrid::mc::Snapshot& snapshot1,
+ simgrid::mc::Region* region1, const void* real_area2,
+ const simgrid::mc::Snapshot& snapshot2, simgrid::mc::Region* region2,
+ const simgrid::mc::Type* type, int pointer_level)
{
- simgrid::mc::Type* subtype;
- simgrid::mc::Type* subsubtype;
+ const simgrid::mc::Type* subtype;
+ const simgrid::mc::Type* subsubtype;
int elm_size;
- int i;
xbt_assert(type != nullptr);
switch (type->type) {
case DW_TAG_typedef:
case DW_TAG_volatile_type:
case DW_TAG_const_type:
- return areas_differ_with_type(state, real_area1, snapshot1, region1, real_area2, snapshot2, region2,
+ return areas_differ_with_type(process, state, real_area1, snapshot1, region1, real_area2, snapshot2, region2,
type->subtype, pointer_level);
case DW_TAG_array_type:
subtype = type->subtype;
default:
return false;
}
- for (i = 0; i < type->element_count; i++) {
+ for (int i = 0; i < type->element_count; i++) {
size_t off = i * elm_size;
- if (areas_differ_with_type(state, (const char*)real_area1 + off, snapshot1, region1,
+ if (areas_differ_with_type(process, state, (const char*)real_area1 + off, snapshot1, region1,
(const char*)real_area2 + off, snapshot2, region2, type->subtype, pointer_level))
return true;
}
if (not snapshot2.on_heap(addr_pointed2))
return true;
// The pointers are both in the heap:
- return simgrid::mc::heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, nullptr,
- type->subtype, pointer_level);
+ return simgrid::mc::heap_area_differ(process, state, addr_pointed1, addr_pointed2, snapshot1, snapshot2,
+ nullptr, type->subtype, pointer_level);
} else if (region1->contain(simgrid::mc::remote(addr_pointed1))) {
// The pointers are both in the current object R/W segment:
if (not type->type_id)
return (addr_pointed1 != addr_pointed2);
else
- return areas_differ_with_type(state, addr_pointed1, snapshot1, region1, addr_pointed2, snapshot2, region2,
- type->subtype, pointer_level);
+ return areas_differ_with_type(process, state, addr_pointed1, snapshot1, region1, addr_pointed2, snapshot2,
+ region2, type->subtype, pointer_level);
} else {
// TODO, We do not handle very well the case where
// it belongs to a different (non-heap) region from the current one.
}
case DW_TAG_structure_type:
case DW_TAG_class_type:
- for (simgrid::mc::Member& member : type->members) {
- void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, &snapshot1);
- void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, &snapshot2);
+ for (const simgrid::mc::Member& member : type->members) {
+ const void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, &snapshot1);
+ const void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, &snapshot2);
simgrid::mc::Region* subregion1 = snapshot1.get_region(member1, region1); // region1 is hinted
simgrid::mc::Region* subregion2 = snapshot2.get_region(member2, region2); // region2 is hinted
- if (areas_differ_with_type(state, member1, snapshot1, subregion1, member2, snapshot2, subregion2, member.type,
- pointer_level))
+ if (areas_differ_with_type(process, state, member1, snapshot1, subregion1, member2, snapshot2, subregion2,
+ member.type, pointer_level))
return true;
}
break;
return false;
}
-static bool global_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info,
- simgrid::mc::Region* r1, simgrid::mc::Region* r2,
- const simgrid::mc::Snapshot& snapshot1, const simgrid::mc::Snapshot& snapshot2)
+static bool global_variables_differ(const simgrid::mc::RemoteProcess& process, simgrid::mc::StateComparator& state,
+ const simgrid::mc::ObjectInformation* object_info, simgrid::mc::Region* r1,
+ simgrid::mc::Region* r2, const simgrid::mc::Snapshot& snapshot1,
+ const simgrid::mc::Snapshot& snapshot2)
{
xbt_assert(r1 && r2, "Missing region.");
// If the variable is not in this object, skip it:
// We do not expect to find a pointer to something which is not reachable
// by the global variables.
- if ((char *) current_var.address < (char *) object_info->start_rw
- || (char *) current_var.address > (char *) object_info->end_rw)
+ if ((char*)current_var.address < object_info->start_rw || (char*)current_var.address > object_info->end_rw)
continue;
- simgrid::mc::Type* bvariable_type = current_var.type;
- if (areas_differ_with_type(state, current_var.address, snapshot1, r1, current_var.address, snapshot2, r2,
+ const simgrid::mc::Type* bvariable_type = current_var.type;
+ if (areas_differ_with_type(process, state, current_var.address, snapshot1, r1, current_var.address, snapshot2, r2,
bvariable_type, 0)) {
XBT_VERB("Global variable %s (%p) is different between snapshots", current_var.name.c_str(), current_var.address);
return true;
return false;
}
-static bool local_variables_differ(simgrid::mc::StateComparator& state, const simgrid::mc::Snapshot& snapshot1,
- const simgrid::mc::Snapshot& snapshot2, const_mc_snapshot_stack_t stack1,
- const_mc_snapshot_stack_t stack2)
+static bool local_variables_differ(const simgrid::mc::RemoteProcess& process, simgrid::mc::StateComparator& state,
+ const simgrid::mc::Snapshot& snapshot1, const simgrid::mc::Snapshot& snapshot2,
+ const_mc_snapshot_stack_t stack1, const_mc_snapshot_stack_t stack2)
{
if (stack1->local_variables.size() != stack2->local_variables.size()) {
XBT_VERB("Different number of local variables");
return true;
}
- if (areas_differ_with_type(state, current_var1->address, snapshot1, snapshot1.get_region(current_var1->address),
- current_var2->address, snapshot2, snapshot2.get_region(current_var2->address),
- current_var1->type, 0)) {
+ if (areas_differ_with_type(process, state, current_var1->address, snapshot1,
+ snapshot1.get_region(current_var1->address), current_var2->address, snapshot2,
+ snapshot2.get_region(current_var2->address), current_var1->type, 0)) {
XBT_VERB("Local variable %s (%p - %p) in frame %s is different between snapshots", current_var1->name.c_str(),
current_var1->address, current_var2->address, current_var1->subprogram->name.c_str());
return true;
// TODO, make this a field of ModelChecker or something similar
static StateComparator state_comparator;
- const RemoteClient& process = mc_model_checker->process();
+ 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_,
}
/* Init heap information used in heap comparison algorithm */
- xbt_mheap_t heap1 = static_cast<xbt_mheap_t>(s1->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
- remote(process.heap_address), ReadOptions::lazy()));
- xbt_mheap_t heap2 = static_cast<xbt_mheap_t>(s2->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
- remote(process.heap_address), ReadOptions::lazy()));
+ const s_xbt_mheap_t* heap1 = static_cast<xbt_mheap_t>(
+ 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<xbt_mheap_t>(
+ 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_);
return false;
const_mc_snapshot_stack_t stack1 = &s1->stacks_[cursor];
const_mc_snapshot_stack_t stack2 = &s2->stacks_[cursor];
- if (local_variables_differ(state_comparator, *s1, *s2, stack1, stack2)) {
+ 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);
return false;
}
xbt_assert(region1->object_info());
/* Compare global variables */
- if (global_variables_differ(state_comparator, region1->object_info(), region1, region2, *s1, *s2)) {
+ if (global_variables_differ(process, state_comparator, region1->object_info(), region1, region2, *s1, *s2)) {
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());
return false;
}
/* Compare heap */
- if (mmalloc_heap_differ(state_comparator, *s1, *s2)) {
+ if (mmalloc_heap_differ(process, state_comparator, *s1, *s2)) {
XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_);
return false;
}
