XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc");
+using simgrid::mc::remote;
+
namespace simgrid {
namespace mc {
-struct HeapLocation;
-typedef std::array<HeapLocation, 2> HeapLocationPair;
-typedef std::set<HeapLocationPair> HeapLocationPairs;
-struct HeapArea;
-struct ProcessComparisonState;
-struct StateComparator;
-
-static int compare_heap_area(StateComparator& state, const void* area1, const void* area2, Snapshot* snapshot1,
- Snapshot* snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level);
-}
-}
-
-using simgrid::mc::remote;
-
/*********************************** Heap comparison ***********************************/
/***************************************************************************************/
-namespace simgrid {
-namespace mc {
-
class HeapLocation {
public:
int block_ = 0;
}
};
-static inline
-HeapLocationPair makeHeapLocationPair(int block1, int fragment1, int block2, int fragment2)
-{
- return simgrid::mc::HeapLocationPair{{
- simgrid::mc::HeapLocation(block1, fragment1),
- simgrid::mc::HeapLocation(block2, fragment2)
- }};
-}
+typedef std::array<HeapLocation, 2> HeapLocationPair;
+typedef std::set<HeapLocationPair> HeapLocationPairs;
class HeapArea : public HeapLocation {
public:
void initHeapInformation(xbt_mheap_t heap, std::vector<simgrid::mc::IgnoredHeapRegion>* i);
};
-namespace {
-
-/** A hash which works with more stuff
- *
- * It can hash pairs: the standard hash currently doesn't include this.
- */
-template <class X> class hash : public std::hash<X> {
-};
-
-template <class X, class Y> class hash<std::pair<X, Y>> {
-public:
- std::size_t operator()(std::pair<X,Y>const& x) const
- {
- hash<X> h1;
- hash<X> h2;
- return h1(x.first) ^ h2(x.second);
- }
-};
-
-}
-
class StateComparator {
public:
s_xbt_mheap_t std_heap_copy;
std::size_t heaplimit;
std::array<ProcessComparisonState, 2> processStates;
- std::unordered_set<std::pair<void*, void*>, hash<std::pair<void*, void*>>> compared_pointers;
+ std::unordered_set<std::pair<const void*, const void*>, simgrid::xbt::hash<std::pair<const void*, const void*>>>
+ compared_pointers;
void clear()
{
return -1;
}
+static bool is_on_heap(const void* address)
+{
+ const xbt_mheap_t heap = mc_model_checker->process().get_heap();
+ return address >= heap->heapbase && address < heap->breakval;
+}
+
static bool is_stack(const void *address)
{
for (auto const& stack : mc_model_checker->process().stack_areas())
xbt_die("No heap region");
}
-static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2)
+static bool heap_area_differ(StateComparator& state, const void* area1, const void* area2, Snapshot* snapshot1,
+ Snapshot* snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level);
+
+static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1,
+ simgrid::mc::Snapshot* snapshot2)
{
- simgrid::mc::RemoteClient* process = &mc_model_checker->process();
+ const simgrid::mc::RemoteClient& process = mc_model_checker->process();
/* Check busy blocks */
size_t i1 = 1;
simgrid::mc::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;
+ void* heapinfo_address = &((xbt_mheap_t)process.heap_address)->heapinfo;
// This is in snapshot do not use them directly:
const malloc_info* heapinfos1 =
/* Try first to associate to same block in the other heap */
if (heapinfo2->type == heapinfo1->type && state.equals_to2_(i1, 0).valid_ == 0) {
void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
- int res_compare = compare_heap_area(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0);
- if (res_compare != 1) {
+ if (not heap_area_differ(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) {
for (size_t k = 1; k < heapinfo2->busy_block.size; k++)
state.equals_to2_(i1 + k, 0) = HeapArea(i1, -1);
for (size_t k = 1; k < heapinfo1->busy_block.size; k++)
continue;
}
- int res_compare = compare_heap_area(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0);
-
- if (res_compare != 1) {
+ if (not heap_area_differ(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) {
for (size_t k = 1; k < heapinfo2b->busy_block.size; k++)
state.equals_to2_(i2 + k, 0) = HeapArea(i1, -1);
for (size_t k = 1; k < heapinfo1->busy_block.size; k++)
if (not equal) {
XBT_DEBUG("Block %zu not found (size_used = %zu, addr = %p)", i1, heapinfo1->busy_block.busy_size, addr_block1);
- return false;
+ return true;
}
} else { /* Fragmented block */
if (heapinfo2->type == heapinfo1->type && not state.equals_to2_(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));
- int res_compare = compare_heap_area(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0);
- if (res_compare != 1)
+ if (not heap_area_differ(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0))
equal = true;
}
void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
void* addr_frag2 = (void*)((char*)addr_block2 + (j2 << heapinfo2b->type));
- int res_compare =
- compare_heap_area(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0);
- if (res_compare != 1) {
+ if (not heap_area_differ(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0)) {
equal = true;
break;
}
if (not equal) {
XBT_DEBUG("Block %zu, fragment_ %zu not found (size_used = %zd, address = %p)\n", i1, j1,
heapinfo1->busy_frag.frag_size[j1], addr_frag1);
- return false;
+ return true;
}
}
if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo1->busy_block.busy_size > 0 &&
not state.equals_to1_(i, 0).valid_) {
XBT_DEBUG("Block %zu not found (size used = %zu)", i, heapinfo1->busy_block.busy_size);
- return false;
+ return true;
}
if (heapinfo1->type <= 0)
for (size_t j = 0; j < (size_t)(BLOCKSIZE >> heapinfo1->type); j++)
if (i1 == state.heaplimit && heapinfo1->busy_frag.frag_size[j] > 0 && not state.equals_to1_(i, j).valid_) {
XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", i, j, heapinfo1->busy_frag.frag_size[j]);
- return false;
+ return true;
}
}
not state.equals_to2_(i, 0).valid_) {
XBT_DEBUG("Block %zu not found (size used = %zu)", i,
heapinfo2->busy_block.busy_size);
- return false;
+ return true;
}
if (heapinfo2->type <= 0)
if (i1 == state.heaplimit && heapinfo2->busy_frag.frag_size[j] > 0 && not state.equals_to2_(i, j).valid_) {
XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)",
i, j, heapinfo2->busy_frag.frag_size[j]);
- return false;
+ return true;
}
}
- return true;
+ return false;
}
/**
* @param previous
* @param size
* @param check_ignore
+ * @return true when different, false otherwise (same or unknown)
*/
-static bool heap_area_equal_without_type(simgrid::mc::StateComparator& state, const void* real_area1,
- const void* real_area2, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous, int size,
- int check_ignore)
+static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, const void* real_area1,
+ const void* real_area2, simgrid::mc::Snapshot* snapshot1,
+ simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous, int size,
+ int check_ignore)
{
- simgrid::mc::RemoteClient* process = &mc_model_checker->process();
+ const simgrid::mc::RemoteClient& process = mc_model_checker->process();
simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1);
simgrid::mc::Region* heap_region2 = MC_get_heap_region(snapshot2);
for (int i = 0; i < size; ) {
if (check_ignore > 0) {
- ssize_t ignore1 = heap_comparison_ignore_size(state.processStates[0].to_ignore, (char*)real_area1 + i);
+ ssize_t ignore1 = heap_comparison_ignore_size(state.processStates[0].to_ignore, (const char*)real_area1 + i);
if (ignore1 != -1) {
- ssize_t ignore2 = heap_comparison_ignore_size(state.processStates[1].to_ignore, (char*)real_area2 + i);
+ ssize_t ignore2 = heap_comparison_ignore_size(state.processStates[1].to_ignore, (const char*)real_area2 + i);
if (ignore2 == ignore1) {
if (ignore1 == 0) {
check_ignore--;
- return true;
+ return false;
} else {
i = i + ignore2;
check_ignore--;
}
}
- if (MC_snapshot_region_memcmp(((char *) real_area1) + i, heap_region1, ((char *) real_area2) + i, heap_region2, 1) != 0) {
+ if (MC_snapshot_region_memcmp((const char*)real_area1 + i, heap_region1, (const char*)real_area2 + i, heap_region2,
+ 1) != 0) {
int pointer_align = (i / sizeof(void *)) * sizeof(void *);
- const void* addr_pointed1 = snapshot1->read(remote((void**)((char*)real_area1 + pointer_align)));
- const void* addr_pointed2 = snapshot2->read(remote((void**)((char*)real_area2 + pointer_align)));
+ const void* addr_pointed1 = snapshot1->read(remote((void**)((const char*)real_area1 + pointer_align)));
+ const void* addr_pointed2 = snapshot2->read(remote((void**)((const char*)real_area2 + pointer_align)));
- if (process->in_maestro_stack(remote(addr_pointed1))
- && process->in_maestro_stack(remote(addr_pointed2))) {
+ if (process.in_maestro_stack(remote(addr_pointed1)) && process.in_maestro_stack(remote(addr_pointed2))) {
i = pointer_align + sizeof(void *);
continue;
}
- if (addr_pointed1 > state.std_heap_copy.heapbase
- && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)
- && addr_pointed2 > state.std_heap_copy.heapbase
- && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) {
+ if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)) {
// Both addresses are in the heap:
- int res_compare =
- compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0);
- if (res_compare == 1)
- return false;
+ if (heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0))
+ return true;
i = pointer_align + sizeof(void *);
continue;
}
- return false;
+ return true;
}
i++;
}
- return true;
+ return false;
}
/**
* @param area_size either a byte_size or an elements_count (?)
* @param check_ignore
* @param pointer_level
- * @return 0 (same), 1 (different), -1 (unknown)
+ * @return true when different, false otherwise (same or unknown)
*/
-static int compare_heap_area_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
+static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
const void* real_area2, simgrid::mc::Snapshot* snapshot1,
simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous,
simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level)
// <538837> DW_AT_decl_file : 98
// <538838> DW_AT_decl_line : 37
if (type == nullptr)
- return 0;
+ return false;
if (is_stack(real_area1) && is_stack(real_area2))
- return 0;
+ return false;
if (check_ignore > 0) {
ssize_t ignore1 = heap_comparison_ignore_size(state.processStates[0].to_ignore, real_area1);
if (ignore1 > 0 && heap_comparison_ignore_size(state.processStates[1].to_ignore, real_area2) == ignore1)
- return 0;
+ return false;
}
simgrid::mc::Type* subtype;
switch (type->type) {
case DW_TAG_unspecified_type:
- return 1;
+ return true;
case DW_TAG_base_type:
if (not type->name.empty() && type->name == "char") { /* String, hence random (arbitrary ?) size */
if (real_area1 == real_area2)
- return -1;
+ return false;
else
return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, area_size) != 0;
} else {
if (area_size != -1 && type->byte_size != area_size)
- return -1;
+ return false;
else
return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0;
}
case DW_TAG_enumeration_type:
if (area_size != -1 && type->byte_size != area_size)
- return -1;
+ return false;
return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0;
case DW_TAG_typedef:
case DW_TAG_const_type:
case DW_TAG_volatile_type:
- return compare_heap_area_with_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, type->subtype,
- area_size, check_ignore, pointer_level);
+ return heap_area_differ_with_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, type->subtype,
+ area_size, check_ignore, pointer_level);
case DW_TAG_array_type:
subtype = type->subtype;
switch (subtype->type) {
case DW_TAG_unspecified_type:
- return 1;
+ return true;
case DW_TAG_base_type:
case DW_TAG_enumeration_type:
elm_size = subsubtype->byte_size;
break;
default:
- return 0;
+ return false;
}
for (int i = 0; i < type->element_count; i++) {
// TODO, add support for variable stride (DW_AT_byte_stride)
- int res = compare_heap_area_with_type(state, (char*)real_area1 + (i * elm_size),
- (char*)real_area2 + (i * elm_size), snapshot1, snapshot2, previous,
- type->subtype, subtype->byte_size, check_ignore, pointer_level);
- if (res == 1)
- return res;
+ if (heap_area_differ_with_type(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;
}
- return 0;
+ return false;
case DW_TAG_reference_type:
case DW_TAG_rvalue_reference_type:
case DW_TAG_pointer_type:
if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) {
- addr_pointed1 = snapshot1->read(remote((void**)real_area1));
- addr_pointed2 = snapshot2->read(remote((void**)real_area2));
+ addr_pointed1 = snapshot1->read(remote((void* const*)real_area1));
+ addr_pointed2 = snapshot2->read(remote((void* const*)real_area2));
return (addr_pointed1 != addr_pointed2);
}
pointer_level++;
if (pointer_level <= 1) {
- addr_pointed1 = snapshot1->read(remote((void**)real_area1));
- addr_pointed2 = snapshot2->read(remote((void**)real_area2));
- if (addr_pointed1 > state.std_heap_copy.heapbase && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) &&
- addr_pointed2 > state.std_heap_copy.heapbase && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))
- return compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
- pointer_level);
+ addr_pointed1 = snapshot1->read(remote((void* const*)real_area1));
+ addr_pointed2 = snapshot2->read(remote((void* const*)real_area2));
+ if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2))
+ return heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
+ pointer_level);
else
return (addr_pointed1 != addr_pointed2);
}
for (size_t i = 0; i < (area_size / sizeof(void*)); i++) {
- addr_pointed1 = snapshot1->read(remote((void**)((char*)real_area1 + i * sizeof(void*))));
- addr_pointed2 = snapshot2->read(remote((void**)((char*)real_area2 + i * sizeof(void*))));
- int res;
- if (addr_pointed1 > state.std_heap_copy.heapbase && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) &&
- addr_pointed2 > state.std_heap_copy.heapbase && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))
- res = compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
- pointer_level);
- else
- res = (addr_pointed1 != addr_pointed2);
- if (res == 1)
- return res;
+ 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 = is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)
+ ? heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous,
+ type->subtype, pointer_level)
+ : addr_pointed1 != addr_pointed2;
+ if (differ)
+ return true;
}
- return 0;
+ return false;
case DW_TAG_structure_type:
case DW_TAG_class_type:
type = type->full_type;
if (area_size != -1 && type->byte_size != area_size) {
if (area_size <= type->byte_size || area_size % type->byte_size != 0)
- return -1;
+ return false;
for (size_t i = 0; i < (size_t)(area_size / type->byte_size); i++) {
- int res = compare_heap_area_with_type(state, (char*)real_area1 + i * type->byte_size,
- (char*)real_area2 + i * type->byte_size, snapshot1, snapshot2, previous,
- type, -1, check_ignore, 0);
- if (res == 1)
- return res;
+ if (heap_area_differ_with_type(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) {
simgrid::dwarf::resolve_member(real_area1, type, &member, (simgrid::mc::AddressSpace*)snapshot1);
void* real_member2 =
simgrid::dwarf::resolve_member(real_area2, type, &member, (simgrid::mc::AddressSpace*)snapshot2);
- int res = compare_heap_area_with_type(state, real_member1, real_member2, snapshot1, snapshot2, previous,
- member.type, -1, check_ignore, 0);
- if (res == 1)
- return res;
+ if (heap_area_differ_with_type(state, real_member1, real_member2, snapshot1, snapshot2, previous,
+ member.type, -1, check_ignore, 0))
+ return true;
}
}
- return 0;
+ return false;
case DW_TAG_union_type:
- return not heap_area_equal_without_type(state, real_area1, real_area2, snapshot1, snapshot2, previous,
- type->byte_size, check_ignore);
+ return heap_area_differ_without_type(state, real_area1, real_area2, snapshot1, snapshot2, previous,
+ type->byte_size, check_ignore);
+
+ default:
+ XBT_VERB("Unknown case: %d", type->type);
+ break;
}
- return 0;
+ return false;
}
/** Infer the type of a part of the block from the type of the block
* @param previous Pairs of blocks already compared on the current path (or nullptr)
* @param type_id Type of variable
* @param pointer_level
- * @return 0 (same), 1 (different), -1
+ * @return true when different, false otherwise (same or unknown)
*/
-static int compare_heap_area(simgrid::mc::StateComparator& state, const void* area1, const void* area2,
+static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* area1, const void* area2,
simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2,
HeapLocationPairs* previous, simgrid::mc::Type* type, int pointer_level)
{
- simgrid::mc::RemoteClient* process = &mc_model_checker->process();
+ const simgrid::mc::RemoteClient& process = mc_model_checker->process();
ssize_t block1;
ssize_t block2;
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;
+ void* heapinfo_address = &((xbt_mheap_t)process.heap_address)->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));
// If either block is a stack block:
if (is_block_stack((int) block1) && is_block_stack((int) block2)) {
- previous->insert(simgrid::mc::makeHeapLocationPair(block1, -1, block2, -1));
+ previous->insert(HeapLocationPair{{HeapLocation(block1, -1), HeapLocation(block2, -1)}});
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
// 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) ||
(block2 > (ssize_t)state.processStates[1].heapsize) || (block2 < 1)) {
- return 1;
+ return true;
}
// Process address of the block:
/* Free block */
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED && heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED) {
state.blocksEqual(block1, block2)) {
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
if (type_size != -1 && type_size != (ssize_t)heapinfo1->busy_block.busy_size &&
(type->name.empty() || type->name == "struct s_smx_context")) {
if (match_pairs)
state.match_equals(previous);
- return -1;
+ return false;
}
- if (heapinfo1->busy_block.size != heapinfo2->busy_block.size)
- return 1;
- if (heapinfo1->busy_block.busy_size != heapinfo2->busy_block.busy_size)
- return 1;
+ if (heapinfo1->busy_block.size != heapinfo2->busy_block.size ||
+ heapinfo1->busy_block.busy_size != heapinfo2->busy_block.busy_size)
+ return true;
- if (not previous->insert(simgrid::mc::makeHeapLocationPair(block1, -1, block2, -1)).second) {
+ if (not previous->insert(HeapLocationPair{{HeapLocation(block1, -1), HeapLocation(block2, -1)}}).second) {
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
size = heapinfo1->busy_block.busy_size;
if (size <= 0) {
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
if (heapinfo1->busy_block.ignore > 0
if (heapinfo1->busy_frag.frag_size[frag1] == -1 || heapinfo2->busy_frag.frag_size[frag2] == -1) {
if (match_pairs)
state.match_equals(previous);
- return -1;
+ return false;
}
// ?
if (type_size != heapinfo1->busy_frag.frag_size[frag1]
|| type_size != heapinfo2->busy_frag.frag_size[frag2]) {
if (match_pairs)
state.match_equals(previous);
- return -1;
+ return false;
}
}
state.fragmentsEqual(block1, frag1, block2, frag2)) {
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
// Compare the size of both fragments:
if (heapinfo1->busy_frag.frag_size[frag1] != heapinfo2->busy_frag.frag_size[frag2]) {
if (type_size == -1) {
if (match_pairs)
state.match_equals(previous);
- return -1;
+ return false;
} else
- return 1;
+ return true;
}
// Size of the fragment_:
} else {
if (match_pairs)
state.match_equals(previous);
- return -1;
+ return false;
}
if (new_type1 != nullptr && new_type2 != nullptr && new_type1 != new_type2) {
} else {
if (match_pairs)
state.match_equals(previous);
- return -1;
+ return false;
}
}
}
if (offset1 == 0 && offset2 == 0 &&
- not previous->insert(simgrid::mc::makeHeapLocationPair(block1, frag1, block2, frag2)).second) {
+ not previous->insert(HeapLocationPair{{HeapLocation(block1, frag1), HeapLocation(block2, frag2)}}).second) {
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
if (size <= 0) {
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
if ((heapinfo1->busy_frag.ignore[frag1] > 0) &&
check_ignore = heapinfo1->busy_frag.ignore[frag1];
} else
- return 1;
-
+ return true;
/* Start comparison */
- int res_compare;
- if (type)
- res_compare = compare_heap_area_with_type(state, area1, area2, snapshot1, snapshot2, previous, type, size,
- check_ignore, pointer_level);
- else
- res_compare =
- not heap_area_equal_without_type(state, area1, area2, snapshot1, snapshot2, previous, size, check_ignore);
-
- if (res_compare == 1)
- return res_compare;
+ 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);
+ if (differ)
+ return true;
if (match_pairs)
state.match_equals(previous);
- return 0;
+ return false;
}
}
/************************** Snapshot comparison *******************************/
/******************************************************************************/
-static int compare_areas_with_type(simgrid::mc::StateComparator& state, void* real_area1,
- simgrid::mc::Snapshot* snapshot1, simgrid::mc::Region* region1, void* real_area2,
- simgrid::mc::Snapshot* snapshot2, simgrid::mc::Region* region2,
- simgrid::mc::Type* type, int pointer_level)
+static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
+ simgrid::mc::Snapshot* snapshot1, simgrid::mc::Region* region1,
+ const void* real_area2, simgrid::mc::Snapshot* snapshot2,
+ simgrid::mc::Region* region2, simgrid::mc::Type* type, int pointer_level)
{
- simgrid::mc::RemoteClient* process = &mc_model_checker->process();
-
simgrid::mc::Type* subtype;
simgrid::mc::Type* subsubtype;
int elm_size;
int i;
- int res;
xbt_assert(type != nullptr);
switch (type->type) {
case DW_TAG_unspecified_type:
- return 1;
+ return true;
case DW_TAG_base_type:
case DW_TAG_enumeration_type:
case DW_TAG_typedef:
case DW_TAG_volatile_type:
case DW_TAG_const_type:
- return compare_areas_with_type(state, real_area1, snapshot1, region1, real_area2, snapshot2, region2,
- type->subtype, pointer_level);
+ return areas_differ_with_type(state, real_area1, snapshot1, region1, real_area2, snapshot2, region2,
+ type->subtype, pointer_level);
case DW_TAG_array_type:
subtype = type->subtype;
switch (subtype->type) {
case DW_TAG_unspecified_type:
- return 1;
+ return true;
case DW_TAG_base_type:
case DW_TAG_enumeration_type:
elm_size = subsubtype->byte_size;
break;
default:
- return 0;
+ return false;
}
for (i = 0; i < type->element_count; i++) {
size_t off = i * elm_size;
- res = compare_areas_with_type(state, (char*)real_area1 + off, snapshot1, region1, (char*)real_area2 + off,
- snapshot2, region2, type->subtype, pointer_level);
- if (res == 1)
- return res;
+ if (areas_differ_with_type(state, (char*)real_area1 + off, snapshot1, region1, (char*)real_area2 + off,
+ snapshot2, region2, type->subtype, pointer_level))
+ return true;
}
break;
case DW_TAG_pointer_type:
case DW_TAG_reference_type:
case DW_TAG_rvalue_reference_type: {
- void* addr_pointed1 = MC_region_read_pointer(region1, real_area1);
- void* addr_pointed2 = MC_region_read_pointer(region2, real_area2);
+ const void* addr_pointed1 = MC_region_read_pointer(region1, real_area1);
+ const void* addr_pointed2 = MC_region_read_pointer(region2, real_area2);
if (type->subtype && type->subtype->type == DW_TAG_subroutine_type)
return (addr_pointed1 != addr_pointed2);
if (addr_pointed1 == nullptr && addr_pointed2 == nullptr)
- return 0;
+ return false;
if (addr_pointed1 == nullptr || addr_pointed2 == nullptr)
- return 1;
+ return true;
if (not state.compared_pointers.insert(std::make_pair(addr_pointed1, addr_pointed2)).second)
- return 0;
+ return false;
pointer_level++;
// * a pointer leads to the read-only segment of the current object
// * a pointer lead to a different ELF object
- if (addr_pointed1 > process->heap_address && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)) {
- if (not(addr_pointed2 > process->heap_address && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)))
- return 1;
+ if (is_on_heap(addr_pointed1)) {
+ if (not is_on_heap(addr_pointed2))
+ return true;
// The pointers are both in the heap:
- return simgrid::mc::compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, nullptr,
- type->subtype, pointer_level);
+ return simgrid::mc::heap_area_differ(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 region2->contain(simgrid::mc::remote(addr_pointed2)))
- return 1;
+ return true;
if (not type->type_id)
return (addr_pointed1 != addr_pointed2);
else
- return compare_areas_with_type(state, addr_pointed1, snapshot1, region1, addr_pointed2, snapshot2, region2,
- type->subtype, pointer_level);
+ return areas_differ_with_type(state, addr_pointed1, snapshot1, region1, addr_pointed2, snapshot2, region2,
+ type->subtype, pointer_level);
} else {
// TODO, We do not handle very well the case where
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
- res = compare_areas_with_type(state, member1, snapshot1, subregion1, member2, snapshot2, subregion2,
- member.type, pointer_level);
- if (res == 1)
- return res;
+ if (areas_differ_with_type(state, member1, snapshot1, subregion1, member2, snapshot2, subregion2, member.type,
+ pointer_level))
+ return true;
}
break;
case DW_TAG_subroutine_type:
- return -1;
+ return false;
default:
XBT_VERB("Unknown case: %d", type->type);
break;
}
- return 0;
+ return false;
}
-static bool global_variables_equal(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info,
- simgrid::mc::Region* r1, simgrid::mc::Region* r2, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2)
+static bool global_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info,
+ simgrid::mc::Region* r1, simgrid::mc::Region* r2, simgrid::mc::Snapshot* snapshot1,
+ simgrid::mc::Snapshot* snapshot2)
{
xbt_assert(r1 && r2, "Missing region.");
continue;
simgrid::mc::Type* bvariable_type = current_var.type;
- int res = compare_areas_with_type(state, (char*)current_var.address, snapshot1, r1, (char*)current_var.address,
- snapshot2, r2, bvariable_type, 0);
- if (res == 1) {
+ if (areas_differ_with_type(state, (char*)current_var.address, snapshot1, r1, (char*)current_var.address, snapshot2,
+ r2, bvariable_type, 0)) {
XBT_VERB("Global variable %s (%p) is different between snapshots",
current_var.name.c_str(),
(char *) current_var.address);
- return false;
+ return true;
}
}
- return true;
+ return false;
}
-static bool local_variables_equal(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2, mc_snapshot_stack_t stack1,
- mc_snapshot_stack_t stack2)
+static bool local_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1,
+ simgrid::mc::Snapshot* snapshot2, mc_snapshot_stack_t stack1,
+ mc_snapshot_stack_t stack2)
{
if (stack1->local_variables.size() != stack2->local_variables.size()) {
XBT_VERB("Different number of local variables");
- return false;
+ return true;
}
for (unsigned int cursor = 0; cursor < stack1->local_variables.size(); cursor++) {
"or frame (%s - %s) or ip (%lu - %lu)",
current_var1->name.c_str(), current_var2->name.c_str(), current_var1->subprogram->name.c_str(),
current_var2->subprogram->name.c_str(), current_var1->ip, current_var2->ip);
- return false;
+ return true;
}
- if (compare_areas_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) == 1) {
+ 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)) {
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 false;
- }
+ return true;
}
- return true;
+ }
+ return false;
}
namespace simgrid {
namespace mc {
-static std::unique_ptr<simgrid::mc::StateComparator> state_comparator;
-
bool snapshot_equal(Snapshot* s1, Snapshot* s2)
{
// TODO, make this a field of ModelChecker or something similar
- if (state_comparator == nullptr)
- state_comparator.reset(new StateComparator());
- else
- state_comparator->clear();
+ static StateComparator state_comparator;
- RemoteClient* process = &mc_model_checker->process();
+ const RemoteClient& process = mc_model_checker->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_);
return false;
- } else
- XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_);
+ }
+ XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_);
/* Compare enabled processes */
if (s1->enabled_processes_ != s2->enabled_processes_) {
/* Init heap information used in heap comparison algorithm */
xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
- remote(process->heap_address), simgrid::mc::ReadOptions::lazy());
+ remote(process.heap_address), 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), simgrid::mc::ReadOptions::lazy());
- int res_init = state_comparator->initHeapInformation(heap1, heap2, &s1->to_ignore_, &s2->to_ignore_);
-
- if (res_init == -1) {
+ remote(process.heap_address), simgrid::mc::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;
}
mc_snapshot_stack_t stack1 = &s1->stacks_[cursor];
mc_snapshot_stack_t stack2 = &s2->stacks_[cursor];
- if (not local_variables_equal(*state_comparator, s1, s2, stack1, stack2)) {
+ if (local_variables_differ(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 (not global_variables_equal(*state_comparator, region1->object_info(), region1, region2, s1, s2)) {
+ if (global_variables_differ(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 (not mmalloc_heap_equal(*state_comparator, s1, s2)) {
+ if (mmalloc_heap_differ(state_comparator, s1, s2)) {
XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_);
return false;
}
- XBT_VERB("(%d - %d) No difference found", s1->num_state_, s2->num_state_);
+ XBT_VERB("(%d - %d) No difference found", s1->num_state_, s2->num_state_);
- return true;
+ return true;
}
}
