int block = 0;
int fragment = 0;
HeapArea() {}
- HeapArea(int block)
- : valid(true), block(block) {}
- HeapArea(int block, int fragment = 0)
- : valid(true), block(block), fragment(fragment) {}
+ explicit HeapArea(int block) : valid(true), block(block) {}
+ HeapArea(int block, int fragment) : valid(true), block(block), fragment(fragment) {}
};
struct ProcessComparisonState {
static inline
mc_mem_region_t MC_get_heap_region(simgrid::mc::Snapshot* snapshot)
{
- for (auto& region : snapshot->snapshot_regions)
+ for (auto const& region : snapshot->snapshot_regions)
if (region->region_type() == simgrid::mc::RegionType::Heap)
return region.get();
xbt_die("No heap region");
int nb_diff1 = 0;
int nb_diff2 = 0;
int equal;
- int res_compare = 0;
/* Check busy blocks */
i1 = 1;
i2 = 1;
equal = 0;
- res_compare = 0;
/* Try first to associate to same block in the other heap */
if (heapinfo2->type == heapinfo1->type
&& state.equals_to2_(i1, 0).valid == 0) {
addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
- res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1,
- snapshot2, nullptr, nullptr, 0);
+ int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2,
+ snapshot1, snapshot2, nullptr, nullptr, 0);
if (res_compare != 1) {
for (k = 1; k < heapinfo2->busy_block.size; k++)
state.equals_to2_(i1 + k, 0) = HeapArea(i1, -1);
continue;
}
- res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing,
- addr_block1, addr_block2, snapshot1, snapshot2,
- nullptr, nullptr, 0);
+ int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2,
+ snapshot1, snapshot2, nullptr, nullptr, 0);
if (res_compare != 1) {
for (k = 1; k < heapinfo2b->busy_block.size; k++)
addr_frag2 =
(void *) ((char *) addr_block2 +
(j1 << heapinfo2->type));
- res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot1,
- snapshot2, nullptr, nullptr, 0);
+ int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2,
+ snapshot1, snapshot2, nullptr, nullptr, 0);
if (res_compare != 1)
equal = 1;
}
addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
addr_frag2 = (void*)((char*)addr_block2 + (j2 << heapinfo2b->type));
- res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot2,
- snapshot2, nullptr, nullptr, 0);
+ int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2,
+ snapshot2, snapshot2, nullptr, nullptr, 0);
if (res_compare != 1) {
equal = 1;
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);
- i2 = state.heaplimit + 1;
i1 = state.heaplimit + 1;
nb_diff1++;
break;
return res;
}
} else {
- for(simgrid::mc::Member& member : type->members) {
+ for (simgrid::mc::Member& member : type->members) {
// TODO, optimize this? (for the offset case)
void *real_member1 = simgrid::dwarf::resolve_member(
real_area1, type, &member, (simgrid::mc::AddressSpace*) snapshot1, process_index);
return nullptr;
}
- for(simgrid::mc::Member& member : type->members) {
+ for (simgrid::mc::Member& member : type->members) {
if (member.has_offset_location()) {
// We have the offset, use it directly (shortcut):
if (member.offset() == offset)
{
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
- int res_compare;
ssize_t block1;
- ssize_t frag1;
ssize_t block2;
- ssize_t frag2;
ssize_t size;
int check_ignore = 0;
- void* real_addr_block1;
- void* real_addr_block2;
- void* real_addr_frag1;
- void* real_addr_frag2;
int type_size = -1;
int offset1 = 0;
int offset2 = 0;
}
// Process address of the block:
- real_addr_block1 = (ADDR2UINT(block1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
- real_addr_block2 = (ADDR2UINT(block2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
+ void* real_addr_block1 = (ADDR2UINT(block1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
+ void* real_addr_block2 = (ADDR2UINT(block2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
if (type) {
if (type->full_type)
// TODO, lookup variable type from block type as done for fragmented blocks
- offset1 = (char*)area1 - (char*)real_addr_block1;
- offset2 = (char*)area2 - (char*)real_addr_block2;
-
if (state.equals_to1_(block1, 0).valid && state.equals_to2_(block2, 0).valid && state.blocksEqual(block1, block2)) {
if (match_pairs)
state.match_equals(previous);
return 0;
}
- frag1 = -1;
- frag2 = -1;
-
if (heapinfo1->busy_block.ignore > 0
&& heapinfo2->busy_block.ignore == heapinfo1->busy_block.ignore)
check_ignore = heapinfo1->busy_block.ignore;
} else if ((heapinfo1->type > 0) && (heapinfo2->type > 0)) { /* Fragmented block */
// Fragment number:
- frag1 = ((uintptr_t)(ADDR2UINT(area1) % (BLOCKSIZE))) >> heapinfo1->type;
- frag2 = ((uintptr_t)(ADDR2UINT(area2) % (BLOCKSIZE))) >> heapinfo2->type;
+ ssize_t frag1 = ((uintptr_t)(ADDR2UINT(area1) % (BLOCKSIZE))) >> heapinfo1->type;
+ ssize_t frag2 = ((uintptr_t)(ADDR2UINT(area2) % (BLOCKSIZE))) >> heapinfo2->type;
// Process address of the fragment:
- real_addr_frag1 = (void*)((char*)real_addr_block1 + (frag1 << heapinfo1->type));
- real_addr_frag2 = (void*)((char*)real_addr_block2 + (frag2 << heapinfo2->type));
+ void* real_addr_frag1 = (void*)((char*)real_addr_block1 + (frag1 << heapinfo1->type));
+ void* real_addr_frag2 = (void*)((char*)real_addr_block2 + (frag2 << heapinfo2->type));
// Check the size of the fragments against the size of the type:
if (type_size != -1) {
// The type of the variable is already known:
if (type) {
- new_type1 = type;
- new_type2 = type;
+ new_type1 = new_type2 = type;
}
// Type inference from the block type.
else if (state.types1_(block1, frag1) != nullptr || state.types2_(block2, frag2) != nullptr) {
/* Start comparison */
+ int res_compare;
if (type)
res_compare = compare_heap_area_with_type(state, process_index, area1, area2, snapshot1, snapshot2, previous, type,
size, check_ignore, pointer_level);
}
case DW_TAG_structure_type:
case DW_TAG_class_type:
- for(simgrid::mc::Member& member : type->members) {
+ for (simgrid::mc::Member& member : type->members) {
void *member1 = simgrid::dwarf::resolve_member(
real_area1, type, &member, snapshot1, process_index);
void *member2 = simgrid::dwarf::resolve_member(
std::vector<simgrid::mc::Variable>& variables = object_info->global_variables;
- for (simgrid::mc::Variable& current_var : variables) {
+ for (simgrid::mc::Variable const& current_var : variables) {
// If the variable is not in this object, skip it:
// We do not expect to find a pointer to something which is not reachable
#else
#ifdef MC_VERBOSE
- XBT_VERB("(%d - %d) Different local variables between stacks %d", num1,
- num2, cursor + 1);
+ XBT_VERB("(%d - %d) Different local variables between stacks %u", num1, num2, cursor + 1);
#endif
return 1;
