}
-static xbt_dynar_t MC_take_snapshot_ignore()
+static std::vector<s_mc_heap_ignore_region_t> MC_take_snapshot_ignore()
{
+ std::vector<s_mc_heap_ignore_region_t> res;
if (mc_heap_comparison_ignore == NULL)
- return NULL;
-
- xbt_dynar_t cpy =
- xbt_dynar_new(sizeof(mc_heap_ignore_region_t),
- heap_ignore_region_free_voidp);
+ return std::move(res);
unsigned int cursor = 0;
mc_heap_ignore_region_t current_region;
xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region) {
- mc_heap_ignore_region_t new_region = NULL;
- new_region = xbt_new0(s_mc_heap_ignore_region_t, 1);
- new_region->address = current_region->address;
- new_region->size = current_region->size;
- new_region->block = current_region->block;
- new_region->fragment = current_region->fragment;
- xbt_dynar_push(cpy, &new_region);
+ s_mc_heap_ignore_region_t new_region;
+ new_region.address = current_region->address;
+ new_region.size = current_region->size;
+ new_region.block = current_region->block;
+ new_region.fragment = current_region->fragment;
+ res.push_back(std::move(new_region));
}
- return cpy;
-
+ return std::move(res);
}
static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
remote(process->heap_address),
simgrid::mc::ProcessIndexMissing, simgrid::mc::AddressSpace::Lazy);
- res_init = init_heap_information(heap1, heap2, s1->to_ignore, s2->to_ignore);
+ res_init = init_heap_information(heap1, heap2, &s1->to_ignore, &s2->to_ignore);
if (res_init == -1) {
#ifdef MC_DEBUG
XBT_DEBUG("(%d - %d) Different heap information", num1, num2);
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);
}
+extern "C" {
+
void reset_heap_information()
{
privatization_index(0),
stack_sizes(),
stacks(nullptr),
- to_ignore(nullptr),
hash(0)
{
}
xbt_free(this->snapshot_regions);
xbt_dynar_free(&(this->stacks));
- xbt_dynar_free(&(this->to_ignore));
}
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
int privatization_index;
std::vector<size_t> stack_sizes;
xbt_dynar_t stacks;
- xbt_dynar_t to_ignore;
+ std::vector<s_mc_heap_ignore_region_t> to_ignore;
uint64_t hash;
std::vector<s_mc_snapshot_ignored_data> ignored_data;
std::vector<s_fd_infos_t> current_fds;
SG_END_DECL()
+XBT_INTERNAL 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);
+
#endif