}
// TODO, have a robust way to find it in O(1)
-static inline
-mc_mem_region_t MC_get_heap_region(simgrid::mc::Snapshot* snapshot)
+static inline RegionSnapshot* MC_get_heap_region(Snapshot* snapshot)
{
for (auto const& region : snapshot->snapshot_regions)
if (region->region_type() == simgrid::mc::RegionType::Heap)
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
/* Start comparison */
- size_t i1;
- size_t i2;
- size_t j1;
- size_t j2;
- size_t k;
- void* addr_block1;
- void* addr_block2;
- void* addr_frag1;
- void* addr_frag2;
int nb_diff1 = 0;
int nb_diff2 = 0;
- int equal;
+ bool equal;
/* Check busy blocks */
- i1 = 1;
+ size_t i1 = 1;
malloc_info heapinfo_temp1;
malloc_info heapinfo_temp2;
malloc_info heapinfo_temp2b;
- mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1);
- mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2);
+ simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
+ simgrid::mc::RegionSnapshot* 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;
abort();
}
- addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase));
+ void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase));
if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */
if (is_stack(addr_block1)) {
- for (k = 0; k < heapinfo1->busy_block.size; k++)
+ for (size_t k = 0; k < heapinfo1->busy_block.size; k++)
state.equals_to1_(i1 + k, 0) = HeapArea(i1, -1);
- for (k = 0; k < heapinfo2->busy_block.size; k++)
+ for (size_t k = 0; k < heapinfo2->busy_block.size; k++)
state.equals_to2_(i1 + k, 0) = HeapArea(i1, -1);
i1 += heapinfo1->busy_block.size;
continue;
continue;
}
- i2 = 1;
- equal = 0;
+ size_t i2 = 1;
+ equal = false;
/* 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;
+ void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
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++)
+ for (size_t k = 1; k < heapinfo2->busy_block.size; k++)
state.equals_to2_(i1 + k, 0) = HeapArea(i1, -1);
- for (k = 1; k < heapinfo1->busy_block.size; k++)
+ for (size_t k = 1; k < heapinfo1->busy_block.size; k++)
state.equals_to1_(i1 + k, 0) = HeapArea(i1, -1);
- equal = 1;
+ equal = true;
i1 += heapinfo1->busy_block.size;
}
}
while (i2 < state.heaplimit && not equal) {
- addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
+ void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
if (i2 == i1) {
i2++;
snapshot1, snapshot2, nullptr, nullptr, 0);
if (res_compare != 1) {
- for (k = 1; k < heapinfo2b->busy_block.size; k++)
+ for (size_t k = 1; k < heapinfo2b->busy_block.size; k++)
state.equals_to2_(i2 + k, 0) = HeapArea(i1, -1);
- for (k = 1; k < heapinfo1->busy_block.size; k++)
+ for (size_t k = 1; k < heapinfo1->busy_block.size; k++)
state.equals_to1_(i1 + k, 0) = HeapArea(i2, -1);
- equal = 1;
+ equal = true;
i1 += heapinfo1->busy_block.size;
}
} else { /* Fragmented block */
- for (j1 = 0; j1 < (size_t) (BLOCKSIZE >> heapinfo1->type); j1++) {
+ for (size_t j1 = 0; j1 < (size_t)(BLOCKSIZE >> heapinfo1->type); j1++) {
if (heapinfo1->busy_frag.frag_size[j1] == -1) /* Free fragment_ */
continue;
if (state.equals_to1_(i1, j1).valid_)
continue;
- addr_frag1 = (void*)((char*)addr_block1 + (j1 << heapinfo1->type));
+ void* addr_frag1 = (void*)((char*)addr_block1 + (j1 << heapinfo1->type));
- i2 = 1;
- equal = 0;
+ size_t i2 = 1;
+ equal = false;
/* Try first to associate to same fragment_ in the other heap */
if (heapinfo2->type == heapinfo1->type && not state.equals_to2_(i1, j1).valid_) {
- addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE +
- (char *) state.std_heap_copy.heapbase;
- addr_frag2 =
- (void *) ((char *) addr_block2 +
- (j1 << heapinfo2->type));
+ 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, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2,
snapshot1, snapshot2, nullptr, nullptr, 0);
if (res_compare != 1)
- equal = 1;
+ equal = true;
}
while (i2 < state.heaplimit && not equal) {
abort();
}
- for (j2 = 0; j2 < (size_t) (BLOCKSIZE >> heapinfo2b->type);
- j2++) {
+ for (size_t j2 = 0; j2 < (size_t)(BLOCKSIZE >> heapinfo2b->type); j2++) {
if (i2 == i1 && j2 == j1)
continue;
if (state.equals_to2_(i2, j2).valid_)
continue;
- addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase;
- addr_frag2 = (void*)((char*)addr_block2 + (j2 << heapinfo2b->type));
+ 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, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2,
snapshot2, snapshot2, nullptr, nullptr, 0);
if (res_compare != 1) {
- equal = 1;
+ equal = true;
break;
}
}
}
/* All blocks/fragments are equal to another block/fragment_ ? */
- size_t i = 1;
- size_t j = 0;
-
- for(i = 1; i < state.heaplimit; i++) {
+ for (size_t i = 1; i < state.heaplimit; i++) {
const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read(
heap_region1, &heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info));
if (heapinfo1->type <= 0)
continue;
- for (j = 0; j < (size_t) (BLOCKSIZE >> heapinfo1->type); j++)
+ 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]);
nb_diff1++;
if (i1 == state.heaplimit)
XBT_DEBUG("Number of blocks/fragments not found in heap1: %d", nb_diff1);
- for (i=1; i < state.heaplimit; i++) {
+ for (size_t i = 1; i < state.heaplimit; i++) {
const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read(
heap_region2, &heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info));
if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo2->busy_block.busy_size > 0 &&
if (heapinfo2->type <= 0)
continue;
- for (j = 0; j < (size_t) (BLOCKSIZE >> heapinfo2->type); j++)
+ for (size_t j = 0; j < (size_t)(BLOCKSIZE >> heapinfo2->type); j++)
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]);
int check_ignore)
{
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
- mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1);
- mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2);
+ simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
+ simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);
for (int i = 0; i < size; ) {
simgrid::mc::Type* subtype;
simgrid::mc::Type* subsubtype;
- int res;
int elm_size;
const void* addr_pointed1;
const void* addr_pointed2;
- mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1);
- mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2);
+ simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
+ simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);
switch (type->type) {
case DW_TAG_unspecified_type:
}
for (int i = 0; i < type->element_count; i++) {
// TODO, add support for variable stride (DW_AT_byte_stride)
- res = compare_heap_area_with_type(state, process_index, (char*)real_area1 + (i * elm_size),
- (char*)real_area2 + (i * elm_size), snapshot1, snapshot2, previous,
- type->subtype, subtype->byte_size, check_ignore, pointer_level);
+ int res = compare_heap_area_with_type(state, process_index, (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;
}
for (size_t i = 0; i < (area_size / sizeof(void*)); i++) {
addr_pointed1 = snapshot1->read(remote((void**)((char*)real_area1 + i * sizeof(void*))), process_index);
addr_pointed2 = snapshot2->read(remote((void**)((char*)real_area2 + i * sizeof(void*))), process_index);
+ 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, process_index, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous,
}
- mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1);
- mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2);
+ simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1);
+ simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2);
const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read(
heap_region1, &heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info));
/************************** Snapshot comparison *******************************/
/******************************************************************************/
-static int compare_areas_with_type(simgrid::mc::StateComparator& state,
- int process_index,
- void* real_area1, simgrid::mc::Snapshot* snapshot1, mc_mem_region_t region1,
- void* real_area2, simgrid::mc::Snapshot* snapshot2, mc_mem_region_t region2,
- simgrid::mc::Type* type, int pointer_level)
+static int compare_areas_with_type(simgrid::mc::StateComparator& state, int process_index, void* real_area1,
+ simgrid::mc::Snapshot* snapshot1, simgrid::mc::RegionSnapshot* region1,
+ void* real_area2, simgrid::mc::Snapshot* snapshot2,
+ simgrid::mc::RegionSnapshot* region2, simgrid::mc::Type* type, int pointer_level)
{
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
int res;
do {
+ xbt_assert(type != nullptr);
switch (type->type) {
case DW_TAG_unspecified_type:
return 1;
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(real_area2, type, &member, snapshot2, process_index);
- mc_mem_region_t subregion1 = mc_get_region_hinted(member1, snapshot1, process_index, region1);
- mc_mem_region_t subregion2 = mc_get_region_hinted(member2, snapshot2, process_index, region2);
+ simgrid::mc::RegionSnapshot* subregion1 = mc_get_region_hinted(member1, snapshot1, process_index, region1);
+ simgrid::mc::RegionSnapshot* subregion2 = mc_get_region_hinted(member2, snapshot2, process_index, region2);
res = compare_areas_with_type(state, process_index, member1, snapshot1, subregion1, member2, snapshot2,
subregion2, member.type, pointer_level);
if (res == 1)
} while (true);
}
-static int compare_global_variables(
- simgrid::mc::StateComparator& state,
- simgrid::mc::ObjectInformation* object_info,
- int process_index,
- mc_mem_region_t r1, mc_mem_region_t r2,
- simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2)
+static int compare_global_variables(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info,
+ int process_index, simgrid::mc::RegionSnapshot* r1, simgrid::mc::RegionSnapshot* r2,
+ simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2)
{
xbt_assert(r1 && r2, "Missing region.");
&& process_count == r2->privatized_data().size());
// Compare the global variables separately for each simulates process:
- for (size_t process_index = 0; process_index < process_count; process_index++) {
- if (compare_global_variables(state,
- object_info, process_index,
- &r1->privatized_data()[process_index],
- &r2->privatized_data()[process_index],
- snapshot1, snapshot2))
+ for (size_t i = 0; i < process_count; i++) {
+ if (compare_global_variables(state, object_info, i, &r1->privatized_data()[i], &r2->privatized_data()[i],
+ snapshot1, snapshot2))
return 1;
}
return 0;
static std::unique_ptr<simgrid::mc::StateComparator> state_comparator;
-int snapshot_compare(int num1, simgrid::mc::Snapshot* s1, int num2, simgrid::mc::Snapshot* s2)
+int snapshot_compare(int num1, Snapshot* s1, int num2, Snapshot* s2)
{
// TODO, make this a field of ModelChecker or something similar
if (state_comparator == nullptr)
- state_comparator = std::unique_ptr<StateComparator>(new StateComparator());
+ state_comparator.reset(new StateComparator());
else
state_comparator->clear();
- simgrid::mc::RemoteClient* process = &mc_model_checker->process();
+ RemoteClient* process = &mc_model_checker->process();
int errors = 0;
xbt_assert(regions_count == s2->snapshot_regions.size());
for (size_t k = 0; k != regions_count; ++k) {
- mc_mem_region_t region1 = s1->snapshot_regions[k].get();
- mc_mem_region_t region2 = s2->snapshot_regions[k].get();
+ RegionSnapshot* region1 = s1->snapshot_regions[k].get();
+ RegionSnapshot* region2 = s2->snapshot_regions[k].get();
// Preconditions:
- if (region1->region_type() != simgrid::mc::RegionType::Data)
+ if (region1->region_type() != RegionType::Data)
continue;
xbt_assert(region1->region_type() == region2->region_type());
}
/* Compare heap */
- if (simgrid::mc::mmalloc_compare_heap(*state_comparator, s1, s2) > 0) {
+ if (mmalloc_compare_heap(*state_comparator, s1, s2) > 0) {
#ifdef MC_DEBUG
XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2);
