#include "mc/mc_private.h"
#include "mc/mc_snapshot.h"
+using simgrid::mc::remote;
+
extern "C" {
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_diff, xbt,
size_t heaplimit;
// Number of blocks in the heaps:
size_t heapsize1, heapsize2;
- xbt_dynar_t to_ignore1, to_ignore2;
+ std::vector<s_mc_heap_ignore_region_t>* to_ignore1;
+ std::vector<s_mc_heap_ignore_region_t>* to_ignore2;
s_heap_area_t *equals_to1, *equals_to2;
dw_type_t *types1, *types2;
size_t available;
return 0;
}
-static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list,
+static ssize_t heap_comparison_ignore_size(std::vector<s_mc_heap_ignore_region_t>* ignore_list,
const void *address)
{
-
- unsigned int cursor = 0;
int start = 0;
- int end = xbt_dynar_length(ignore_list) - 1;
- mc_heap_ignore_region_t region;
+ int end = ignore_list->size() - 1;
while (start <= end) {
- cursor = (start + end) / 2;
- region =
- (mc_heap_ignore_region_t) xbt_dynar_get_as(ignore_list, cursor,
- mc_heap_ignore_region_t);
- if (region->address == address)
- return region->size;
- if (region->address < address)
+ unsigned int cursor = (start + end) / 2;
+ s_mc_heap_ignore_region_t region = (*ignore_list)[cursor];
+ if (region.address == address)
+ return region.size;
+ if (region.address < address)
start = cursor + 1;
- if (region->address > address)
+ if (region.address > address)
end = cursor - 1;
}
return 0;
}
-int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1,
- xbt_dynar_t i2)
+}
+
+int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
+ std::vector<s_mc_heap_ignore_region_t>* i1,
+ std::vector<s_mc_heap_ignore_region_t>* i2)
{
if (mc_diff_info == NULL) {
mc_diff_info = xbt_new0(struct s_mc_diff, 1);
state->heaplimit = ((struct mdesc *) heap1)->heaplimit;
- state->std_heap_copy = *MC_process_get_heap(&mc_model_checker->process());
+ state->std_heap_copy = *mc_model_checker->process().get_heap();
state->heapsize1 = heap1->heapsize;
state->heapsize2 = heap2->heapsize;
}
+extern "C" {
+
void reset_heap_information()
{
static inline
mc_mem_region_t MC_get_heap_region(mc_snapshot_t snapshot)
{
- size_t n = snapshot->snapshot_regions_count;
+ size_t n = snapshot->snapshot_regions.size();
for (size_t i=0; i!=n; ++i) {
- mc_mem_region_t region = snapshot->snapshot_regions[i];
- if (region->region_type == MC_REGION_TYPE_HEAP)
+ mc_mem_region_t region = snapshot->snapshot_regions[i].get();
+ if (region->region_type() == simgrid::mc::RegionType::Heap)
return region;
}
xbt_die("No heap region");
void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo;
// This is in snapshot do not use them directly:
- const malloc_info* heapinfos1 = (const malloc_info*) MC_snapshot_read_pointer(snapshot1, heapinfo_address, MC_PROCESS_INDEX_MISSING);
- const malloc_info* heapinfos2 = (const malloc_info*) MC_snapshot_read_pointer(snapshot2, heapinfo_address, MC_PROCESS_INDEX_MISSING);
+ const malloc_info* heapinfos1 = snapshot1->read<malloc_info*>(
+ (std::uint64_t)heapinfo_address, simgrid::mc::ProcessIndexMissing);
+ const malloc_info* heapinfos2 = snapshot2->read<malloc_info*>(
+ (std::uint64_t)heapinfo_address, simgrid::mc::ProcessIndexMissing);
while (i1 <= state->heaplimit) {
(char *) state->std_heap_copy.heapbase;
res_compare =
- compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_block1, addr_block2, snapshot1, snapshot2,
+ compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2,
NULL, NULL, 0);
if (res_compare != 1) {
}
res_compare =
- compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_block1, addr_block2, snapshot1, snapshot2,
+ compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2,
NULL, NULL, 0);
if (res_compare != 1) {
(j1 << heapinfo2->type));
res_compare =
- compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_frag1, addr_frag2, snapshot1, snapshot2,
+ compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot1, snapshot2,
NULL, NULL, 0);
if (res_compare != 1)
(j2 << heapinfo2b->type));
res_compare =
- compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_frag1, addr_frag2, snapshot2, snapshot2,
+ compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot2, snapshot2,
NULL, NULL, 0);
if (res_compare != 1) {
if (MC_snapshot_region_memcmp(((char *) real_area1) + i, heap_region1, ((char *) real_area2) + i, heap_region2, 1) != 0) {
pointer_align = (i / sizeof(void *)) * sizeof(void *);
- addr_pointed1 = MC_snapshot_read_pointer(snapshot1, (char *) real_area1 + pointer_align, process_index);
- addr_pointed2 = MC_snapshot_read_pointer(snapshot2, (char *) real_area2 + pointer_align, process_index);
+ addr_pointed1 = snapshot1->read(
+ remote((void**)((char *) real_area1 + pointer_align)), process_index);
+ addr_pointed2 = snapshot2->read(
+ remote((void**)((char *) real_area2 + pointer_align)), process_index);
- if (addr_pointed1 > process->maestro_stack_start
- && addr_pointed1 < process->maestro_stack_end
- && addr_pointed2 > process->maestro_stack_start
- && addr_pointed2 < process->maestro_stack_end) {
+ if (process->in_maestro_stack(remote(addr_pointed1))
+ && process->in_maestro_stack(remote(addr_pointed2))) {
i = pointer_align + sizeof(void *);
continue;
} else if (addr_pointed1 > state->std_heap_copy.heapbase
case DW_TAG_rvalue_reference_type:
case DW_TAG_pointer_type:
if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) {
- addr_pointed1 = MC_snapshot_read_pointer(snapshot1, real_area1, process_index);
- addr_pointed2 = MC_snapshot_read_pointer(snapshot2, real_area2, process_index);
+ addr_pointed1 = snapshot1->read(remote((void**)real_area1), process_index);
+ addr_pointed2 = snapshot2->read(remote((void**)real_area2), process_index);
return (addr_pointed1 != addr_pointed2);;
} else {
pointer_level++;
if (pointer_level > 1) { /* Array of pointers */
for (size_t i = 0; i < (area_size / sizeof(void *)); i++) {
- addr_pointed1 = MC_snapshot_read_pointer(snapshot1, (char*) real_area1 + i * sizeof(void *), process_index);
- addr_pointed2 = MC_snapshot_read_pointer(snapshot2, (char*) real_area2 + i * sizeof(void *), process_index);
+ 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);
if (addr_pointed1 > state->std_heap_copy.heapbase
&& addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)
&& addr_pointed2 > state->std_heap_copy.heapbase
return res;
}
} else {
- addr_pointed1 = MC_snapshot_read_pointer(snapshot1, real_area1, process_index);
- addr_pointed2 = MC_snapshot_read_pointer(snapshot2, real_area2, process_index);
+ addr_pointed1 = snapshot1->read(remote((void**)real_area1), process_index);
+ addr_pointed2 = snapshot2->read(remote((void**)real_area2), process_index);
if (addr_pointed1 > state->std_heap_copy.heapbase
&& addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)
&& addr_pointed2 > state->std_heap_copy.heapbase
// This is the address of std_heap->heapinfo in the application process:
void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo;
- const malloc_info* heapinfos1 = (const malloc_info*) MC_snapshot_read_pointer(
- snapshot1, heapinfo_address, process_index);
- const malloc_info* heapinfos2 = (const malloc_info*) MC_snapshot_read_pointer(
- snapshot2, heapinfo_address, process_index);
+ const malloc_info* heapinfos1 = snapshot1->read(
+ remote((const malloc_info**)heapinfo_address), process_index);
+ const malloc_info* heapinfos2 = snapshot2->read(
+ remote((const malloc_info**)heapinfo_address), process_index);
malloc_info heapinfo_temp1, heapinfo_temp2;
/* Heap information */
state->heaplimit = ((struct mdesc *) heap1)->heaplimit;
- state->std_heap_copy = *MC_process_get_heap(&mc_model_checker->process());
+ state->std_heap_copy = *mc_model_checker->process().get_heap();
state->heapbase1 = (char *) heap1 + BLOCKSIZE;
state->heapbase2 = (char *) heap2 + BLOCKSIZE;
