-/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
std::vector<Type*> types;
std::size_t heapsize = 0;
- void initHeapInformation(xbt_mheap_t heap, const std::vector<IgnoredHeapRegion>& i);
+ void initHeapInformation(const s_xbt_mheap_t* heap, const std::vector<IgnoredHeapRegion>& i);
};
class StateComparator {
compared_pointers.clear();
}
- int initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, const std::vector<IgnoredHeapRegion>& i1,
- const std::vector<IgnoredHeapRegion>& i2);
+ int initHeapInformation(const s_xbt_mheap_t* heap1, const s_xbt_mheap_t* heap2,
+ const std::vector<IgnoredHeapRegion>& i1, const std::vector<IgnoredHeapRegion>& i2);
template <int rank> HeapArea& equals_to_(std::size_t i, std::size_t j)
{
this->equals_to_<2>(b2, f2).block_ == b1 && this->equals_to_<2>(b2, f2).fragment_ == f1;
}
- void match_equals(HeapLocationPairs* list);
+ void match_equals(const HeapLocationPairs* list);
};
} // namespace mc
static bool is_stack(const void *address)
{
- for (auto const& stack : mc_model_checker->process().stack_areas())
+ for (auto const& stack : mc_model_checker->get_remote_simulation().stack_areas())
if (address == stack.address)
return true;
return false;
// TODO, this should depend on the snapshot?
static bool is_block_stack(int block)
{
- for (auto const& stack : mc_model_checker->process().stack_areas())
+ for (auto const& stack : mc_model_checker->get_remote_simulation().stack_areas())
if (block == stack.block)
return true;
return false;
namespace simgrid {
namespace mc {
-void StateComparator::match_equals(HeapLocationPairs* list)
+void StateComparator::match_equals(const HeapLocationPairs* list)
{
for (auto const& pair : *list) {
if (pair[0].fragment_ != -1) {
}
}
-void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, const std::vector<IgnoredHeapRegion>& i)
+void ProcessComparisonState::initHeapInformation(const s_xbt_mheap_t* heap, const std::vector<IgnoredHeapRegion>& i)
{
auto heaplimit = heap->heaplimit;
this->heapsize = heap->heapsize;
this->types.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, nullptr);
}
-int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, const std::vector<IgnoredHeapRegion>& i1,
+int StateComparator::initHeapInformation(const s_xbt_mheap_t* heap1, const s_xbt_mheap_t* heap2,
+ const std::vector<IgnoredHeapRegion>& i1,
const std::vector<IgnoredHeapRegion>& i2)
{
if ((heap1->heaplimit != heap2->heaplimit) || (heap1->heapsize != heap2->heapsize))
return -1;
this->heaplimit = heap1->heaplimit;
- this->std_heap_copy = *mc_model_checker->process().get_heap();
+ this->std_heap_copy = *mc_model_checker->get_remote_simulation().get_heap();
this->processStates[0].initHeapInformation(heap1, i1);
this->processStates[1].initHeapInformation(heap2, i2);
return 0;
static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot1, const Snapshot& snapshot2)
{
- const RemoteClient& process = mc_model_checker->process();
+ const RemoteSimulation& process = mc_model_checker->get_remote_simulation();
/* Check busy blocks */
size_t i1 = 1;
malloc_info heapinfo_temp2;
malloc_info heapinfo_temp2b;
- Region* heap_region1 = MC_get_heap_region(snapshot1);
- Region* heap_region2 = MC_get_heap_region(snapshot2);
+ const Region* heap_region1 = MC_get_heap_region(snapshot1);
+ const 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;
continue;
}
- xbt_assert(heapinfo1->type >= 0, "Unkown mmalloc block type: %d", heapinfo1->type);
+ xbt_assert(heapinfo1->type >= 0, "Unknown mmalloc block type: %d", heapinfo1->type);
void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase));
continue;
}
- xbt_assert(heapinfo2b->type >= 0, "Unkown mmalloc block type: %d", heapinfo2b->type);
+ xbt_assert(heapinfo2b->type >= 0, "Unknown mmalloc block type: %d", heapinfo2b->type);
for (size_t j2 = 0; j2 < (size_t)(BLOCKSIZE >> heapinfo2b->type); j2++) {
if (i2 == i1 && j2 == j1)
const Snapshot& snapshot1, const Snapshot& snapshot2,
HeapLocationPairs* previous, int size, int check_ignore)
{
- const RemoteClient& process = mc_model_checker->process();
- Region* heap_region1 = MC_get_heap_region(snapshot1);
- Region* heap_region2 = MC_get_heap_region(snapshot2);
+ const RemoteSimulation& process = mc_model_checker->get_remote_simulation();
+ const Region* heap_region1 = MC_get_heap_region(snapshot1);
+ const Region* heap_region2 = MC_get_heap_region(snapshot2);
for (int i = 0; i < size; ) {
if (check_ignore > 0) {
*/
static bool heap_area_differ_with_type(StateComparator& state, const void* real_area1, const void* real_area2,
const Snapshot& snapshot1, const Snapshot& snapshot2,
- HeapLocationPairs* previous, Type* type, int area_size, int check_ignore,
+ HeapLocationPairs* previous, const Type* type, int area_size, int check_ignore,
int pointer_level)
{
// HACK: This should not happen but in practice, there are some
const void* addr_pointed1;
const void* addr_pointed2;
- Region* heap_region1 = MC_get_heap_region(snapshot1);
- Region* heap_region2 = MC_get_heap_region(snapshot2);
+ const Region* heap_region1 = MC_get_heap_region(snapshot1);
+ const Region* heap_region2 = MC_get_heap_region(snapshot2);
switch (type->type) {
case DW_TAG_unspecified_type:
return true;
}
} else {
- for (simgrid::mc::Member& member : type->members) {
+ for (const simgrid::mc::Member& member : type->members) {
// TODO, optimize this? (for the offset case)
const void* real_member1 = dwarf::resolve_member(real_area1, type, &member, &snapshot1);
const void* real_member2 = dwarf::resolve_member(real_area2, type, &member, &snapshot2);
return nullptr;
}
- for (simgrid::mc::Member& member : type->members) {
+ for (const simgrid::mc::Member& member : type->members) {
if (member.has_offset_location()) {
// We have the offset, use it directly (shortcut):
if (member.offset() == offset)
static bool heap_area_differ(StateComparator& state, const void* area1, const void* area2, const Snapshot& snapshot1,
const Snapshot& snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level)
{
- const simgrid::mc::RemoteClient& process = mc_model_checker->process();
+ const simgrid::mc::RemoteSimulation& process = mc_model_checker->get_remote_simulation();
ssize_t block1;
ssize_t block2;
type_size = type->byte_size;
}
- simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1);
- simgrid::mc::Region* heap_region2 = MC_get_heap_region(snapshot2);
+ const Region* heap_region1 = MC_get_heap_region(snapshot1);
+ const Region* heap_region2 = MC_get_heap_region(snapshot2);
const malloc_info* heapinfo1 =
(const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info));
} else if ((heapinfo1->type > 0) && (heapinfo2->type > 0)) { /* Fragmented block */
// Fragment number:
- ssize_t frag1 = ((uintptr_t)(ADDR2UINT(area1) % (BLOCKSIZE))) >> heapinfo1->type;
- ssize_t frag2 = ((uintptr_t)(ADDR2UINT(area2) % (BLOCKSIZE))) >> heapinfo2->type;
+ ssize_t frag1 = (ADDR2UINT(area1) % BLOCKSIZE) >> heapinfo1->type;
+ ssize_t frag2 = (ADDR2UINT(area2) % BLOCKSIZE) >> heapinfo2->type;
// Process address of the fragment_:
void* real_addr_frag1 = (void*)((char*)real_addr_block1 + (frag1 << heapinfo1->type));
static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
const simgrid::mc::Snapshot& snapshot1, simgrid::mc::Region* region1,
const void* real_area2, const simgrid::mc::Snapshot& snapshot2,
- simgrid::mc::Region* region2, simgrid::mc::Type* type, int pointer_level)
+ simgrid::mc::Region* region2, const simgrid::mc::Type* type, int pointer_level)
{
const simgrid::mc::Type* subtype;
const simgrid::mc::Type* subsubtype;
}
case DW_TAG_structure_type:
case DW_TAG_class_type:
- for (simgrid::mc::Member& member : type->members) {
+ for (const simgrid::mc::Member& member : type->members) {
const void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, &snapshot1);
const void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, &snapshot2);
simgrid::mc::Region* subregion1 = snapshot1.get_region(member1, region1); // region1 is hinted
return false;
}
-static bool global_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info,
- simgrid::mc::Region* r1, simgrid::mc::Region* r2,
- const simgrid::mc::Snapshot& snapshot1, const simgrid::mc::Snapshot& snapshot2)
+static bool global_variables_differ(simgrid::mc::StateComparator& state,
+ const simgrid::mc::ObjectInformation* object_info, simgrid::mc::Region* r1,
+ simgrid::mc::Region* r2, const simgrid::mc::Snapshot& snapshot1,
+ const simgrid::mc::Snapshot& snapshot2)
{
xbt_assert(r1 && r2, "Missing region.");
// If the variable is not in this object, skip it:
// We do not expect to find a pointer to something which is not reachable
// by the global variables.
- if ((char *) current_var.address < (char *) object_info->start_rw
- || (char *) current_var.address > (char *) object_info->end_rw)
+ if ((char*)current_var.address < object_info->start_rw || (char*)current_var.address > object_info->end_rw)
continue;
- simgrid::mc::Type* bvariable_type = current_var.type;
+ const simgrid::mc::Type* bvariable_type = current_var.type;
if (areas_differ_with_type(state, current_var.address, snapshot1, r1, current_var.address, snapshot2, r2,
bvariable_type, 0)) {
XBT_VERB("Global variable %s (%p) is different between snapshots", current_var.name.c_str(), current_var.address);
// TODO, make this a field of ModelChecker or something similar
static StateComparator state_comparator;
- const RemoteClient& process = mc_model_checker->process();
+ const RemoteSimulation& process = mc_model_checker->get_remote_simulation();
if (s1->hash_ != s2->hash_) {
XBT_VERB("(%d - %d) Different hash: 0x%" PRIx64 "--0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_,
}
/* Init heap information used in heap comparison algorithm */
- xbt_mheap_t heap1 = static_cast<xbt_mheap_t>(s1->read_bytes(alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t),
- remote(process.heap_address), ReadOptions::lazy()));
- xbt_mheap_t heap2 = static_cast<xbt_mheap_t>(s2->read_bytes(alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t),
- remote(process.heap_address), ReadOptions::lazy()));
+ const s_xbt_mheap_t* heap1 = static_cast<xbt_mheap_t>(s1->read_bytes(
+ alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), remote(process.heap_address), ReadOptions::lazy()));
+ const s_xbt_mheap_t* heap2 = static_cast<xbt_mheap_t>(s2->read_bytes(
+ alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), remote(process.heap_address), 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;
