class ProcessComparisonState {
public:
- std::vector<simgrid::mc::IgnoredHeapRegion>* to_ignore = nullptr;
+ const std::vector<simgrid::mc::IgnoredHeapRegion>* to_ignore = nullptr;
std::vector<HeapArea> equals_to;
std::vector<simgrid::mc::Type*> types;
std::size_t heapsize = 0;
- void initHeapInformation(xbt_mheap_t heap, std::vector<simgrid::mc::IgnoredHeapRegion>* i);
+ void initHeapInformation(xbt_mheap_t heap, const std::vector<simgrid::mc::IgnoredHeapRegion>& i);
};
class StateComparator {
compared_pointers.clear();
}
- int initHeapInformation(
- xbt_mheap_t heap1, xbt_mheap_t heap2,
- std::vector<simgrid::mc::IgnoredHeapRegion>* i1,
- std::vector<simgrid::mc::IgnoredHeapRegion>* i2);
+ int initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, const std::vector<simgrid::mc::IgnoredHeapRegion>& i1,
+ const std::vector<simgrid::mc::IgnoredHeapRegion>& i2);
template <int rank> HeapArea& equals_to_(std::size_t i, std::size_t j)
{
/************************************************************************************/
-static ssize_t heap_comparison_ignore_size(
- std::vector<simgrid::mc::IgnoredHeapRegion>* ignore_list,
- const void *address)
+static ssize_t heap_comparison_ignore_size(const std::vector<simgrid::mc::IgnoredHeapRegion>* ignore_list,
+ const void* address)
{
int start = 0;
int end = ignore_list->size() - 1;
return -1;
}
-static bool is_on_heap(const void* address)
-{
- const xbt_mheap_t heap = mc_model_checker->process().get_heap();
- return address >= heap->heapbase && address < heap->breakval;
-}
-
static bool is_stack(const void *address)
{
for (auto const& stack : mc_model_checker->process().stack_areas())
}
}
-void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap,
- std::vector<simgrid::mc::IgnoredHeapRegion>* i)
+void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, const std::vector<simgrid::mc::IgnoredHeapRegion>& i)
{
auto heaplimit = heap->heaplimit;
this->heapsize = heap->heapsize;
- this->to_ignore = i;
+ this->to_ignore = &i;
this->equals_to.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, HeapArea());
this->types.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, nullptr);
}
int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2,
- std::vector<simgrid::mc::IgnoredHeapRegion>* i1,
- std::vector<simgrid::mc::IgnoredHeapRegion>* i2)
+ const std::vector<simgrid::mc::IgnoredHeapRegion>& i1,
+ const std::vector<simgrid::mc::IgnoredHeapRegion>& i2)
{
if ((heap1->heaplimit != heap2->heaplimit) || (heap1->heapsize != heap2->heapsize))
return -1;
}
// TODO, have a robust way to find it in O(1)
-static inline Region* MC_get_heap_region(Snapshot* snapshot)
+static inline Region* MC_get_heap_region(const Snapshot& snapshot)
{
- for (auto const& 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");
}
-static bool heap_area_differ(StateComparator& state, const void* area1, const void* area2, Snapshot* snapshot1,
- Snapshot* snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level);
+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);
-static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2)
+static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, const simgrid::mc::Snapshot& snapshot1,
+ const simgrid::mc::Snapshot& snapshot2)
{
const simgrid::mc::RemoteClient& process = mc_model_checker->process();
// This is in snapshot do not use them directly:
const malloc_info* heapinfos1 =
- snapshot1->read<malloc_info*>(RemotePtr<malloc_info*>((std::uint64_t)heapinfo_address));
+ snapshot1.read<malloc_info*>(RemotePtr<malloc_info*>((std::uint64_t)heapinfo_address));
const malloc_info* heapinfos2 =
- snapshot2->read<malloc_info*>(RemotePtr<malloc_info*>((std::uint64_t)heapinfo_address));
+ snapshot2.read<malloc_info*>(RemotePtr<malloc_info*>((std::uint64_t)heapinfo_address));
while (i1 < state.heaplimit) {
continue;
}
- if (heapinfo1->type < 0) {
- fprintf(stderr, "Unkown mmalloc block type.\n");
- abort();
- }
+ xbt_assert(heapinfo1->type >= 0, "Unkown mmalloc block type: %d", heapinfo1->type);
void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase));
continue;
}
- if (heapinfo2b->type < 0) {
- fprintf(stderr, "Unknown mmalloc block type.\n");
- abort();
- }
+ xbt_assert(heapinfo2b->type >= 0, "Unkown mmalloc block type: %d", heapinfo2b->type);
for (size_t j2 = 0; j2 < (size_t)(BLOCKSIZE >> heapinfo2b->type); j2++) {
* @return true when different, false otherwise (same or unknown)
*/
static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, const void* real_area1,
- const void* real_area2, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous, int size,
+ const void* real_area2, const simgrid::mc::Snapshot& snapshot1,
+ const simgrid::mc::Snapshot& snapshot2, HeapLocationPairs* previous, int size,
int check_ignore)
{
const simgrid::mc::RemoteClient& process = mc_model_checker->process();
1) != 0) {
int pointer_align = (i / sizeof(void *)) * sizeof(void *);
- const void* addr_pointed1 = snapshot1->read(remote((void**)((const char*)real_area1 + pointer_align)));
- const void* addr_pointed2 = snapshot2->read(remote((void**)((const char*)real_area2 + pointer_align)));
+ const void* addr_pointed1 = snapshot1.read(remote((void* const*)((const char*)real_area1 + pointer_align)));
+ const void* addr_pointed2 = snapshot2.read(remote((void* const*)((const char*)real_area2 + pointer_align)));
if (process.in_maestro_stack(remote(addr_pointed1)) && process.in_maestro_stack(remote(addr_pointed2))) {
i = pointer_align + sizeof(void *);
continue;
}
- if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)) {
+ if (snapshot1.on_heap(addr_pointed1) && snapshot2.on_heap(addr_pointed2)) {
// Both addresses are in the heap:
if (heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0))
return true;
* @return true when different, false otherwise (same or unknown)
*/
static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
- const void* real_area2, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous,
+ const void* real_area2, const simgrid::mc::Snapshot& snapshot1,
+ const simgrid::mc::Snapshot& snapshot2, HeapLocationPairs* previous,
simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level)
{
// HACK: This should not happen but in pratice, there are some
case DW_TAG_rvalue_reference_type:
case DW_TAG_pointer_type:
if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) {
- addr_pointed1 = snapshot1->read(remote((void* const*)real_area1));
- addr_pointed2 = snapshot2->read(remote((void* const*)real_area2));
+ addr_pointed1 = snapshot1.read(remote((void* const*)real_area1));
+ addr_pointed2 = snapshot2.read(remote((void* const*)real_area2));
return (addr_pointed1 != addr_pointed2);
}
pointer_level++;
if (pointer_level <= 1) {
- addr_pointed1 = snapshot1->read(remote((void* const*)real_area1));
- addr_pointed2 = snapshot2->read(remote((void* const*)real_area2));
- if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2))
+ addr_pointed1 = snapshot1.read(remote((void* const*)real_area1));
+ addr_pointed2 = snapshot2.read(remote((void* const*)real_area2));
+ if (snapshot1.on_heap(addr_pointed1) && snapshot2.on_heap(addr_pointed2))
return heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
pointer_level);
else
return (addr_pointed1 != addr_pointed2);
}
for (size_t i = 0; i < (area_size / sizeof(void*)); i++) {
- addr_pointed1 = snapshot1->read(remote((void* const*)((const char*)real_area1 + i * sizeof(void*))));
- addr_pointed2 = snapshot2->read(remote((void* const*)((const char*)real_area2 + i * sizeof(void*))));
- bool differ = is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)
+ addr_pointed1 = snapshot1.read(remote((void* const*)((const char*)real_area1 + i * sizeof(void*))));
+ addr_pointed2 = snapshot2.read(remote((void* const*)((const char*)real_area2 + i * sizeof(void*))));
+ bool differ = snapshot1.on_heap(addr_pointed1) && snapshot2.on_heap(addr_pointed2)
? heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous,
type->subtype, pointer_level)
: addr_pointed1 != addr_pointed2;
} else {
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);
- void* real_member2 =
- simgrid::dwarf::resolve_member(real_area2, type, &member, (simgrid::mc::AddressSpace*)snapshot2);
+ void* real_member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, &snapshot1);
+ void* real_member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, &snapshot2);
if (heap_area_differ_with_type(state, real_member1, real_member2, snapshot1, snapshot2, previous,
member.type, -1, check_ignore, 0))
return true;
type->byte_size, check_ignore);
default:
- XBT_VERB("Unknown case: %d", type->type);
- break;
+ THROW_IMPOSSIBLE;
}
- return false;
}
/** Infer the type of a part of the block from the type of the block
* @return DWARF type ID for given offset
*/
static simgrid::mc::Type* get_offset_type(void* real_base_address, simgrid::mc::Type* type, int offset, int area_size,
- simgrid::mc::Snapshot* snapshot)
+ const simgrid::mc::Snapshot& snapshot)
{
// Beginning of the block, the infered variable type if the type of the block:
if (member.offset() == offset)
return member.type;
} else {
- void* real_member = simgrid::dwarf::resolve_member(real_base_address, type, &member, snapshot);
+ void* real_member = simgrid::dwarf::resolve_member(real_base_address, type, &member, &snapshot);
if ((char*)real_member - (char*)real_base_address == offset)
return member.type;
}
* @return true when different, false otherwise (same or unknown)
*/
static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* area1, const void* area2,
- simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2,
+ const simgrid::mc::Snapshot& snapshot1, const simgrid::mc::Snapshot& snapshot2,
HeapLocationPairs* previous, simgrid::mc::Type* type, int pointer_level)
{
const simgrid::mc::RemoteClient& process = mc_model_checker->process();
// 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 = snapshot1->read(remote((const malloc_info**)heapinfo_address));
- const malloc_info* heapinfos2 = snapshot2->read(remote((const malloc_info**)heapinfo_address));
+ const malloc_info* heapinfos1 = snapshot1.read(remote((const malloc_info**)heapinfo_address));
+ const malloc_info* heapinfos2 = snapshot2.read(remote((const malloc_info**)heapinfo_address));
malloc_info heapinfo_temp1;
malloc_info heapinfo_temp2;
/******************************************************************************/
static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
- simgrid::mc::Snapshot* snapshot1, simgrid::mc::Region* region1,
- const void* real_area2, simgrid::mc::Snapshot* snapshot2,
+ 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::Type* subtype;
}
for (i = 0; i < type->element_count; i++) {
size_t off = i * elm_size;
- if (areas_differ_with_type(state, (char*)real_area1 + off, snapshot1, region1, (char*)real_area2 + off,
- snapshot2, region2, type->subtype, pointer_level))
+ if (areas_differ_with_type(state, (const char*)real_area1 + off, snapshot1, region1,
+ (const char*)real_area2 + off, snapshot2, region2, type->subtype, pointer_level))
return true;
}
break;
// * a pointer leads to the read-only segment of the current object
// * a pointer lead to a different ELF object
- if (is_on_heap(addr_pointed1)) {
- if (not is_on_heap(addr_pointed2))
+ if (snapshot1.on_heap(addr_pointed1)) {
+ if (not snapshot2.on_heap(addr_pointed2))
return true;
// The pointers are both in the heap:
return simgrid::mc::heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, nullptr,
case DW_TAG_structure_type:
case DW_TAG_class_type:
for (simgrid::mc::Member& member : type->members) {
- void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, snapshot1);
- void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, snapshot2);
- simgrid::mc::Region* subregion1 = snapshot1->get_region(member1, region1); // region1 is hinted
- simgrid::mc::Region* subregion2 = snapshot2->get_region(member2, region2); // region2 is hinted
+ void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, &snapshot1);
+ void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, &snapshot2);
+ simgrid::mc::Region* subregion1 = snapshot1.get_region(member1, region1); // region1 is hinted
+ simgrid::mc::Region* subregion2 = snapshot2.get_region(member2, region2); // region2 is hinted
if (areas_differ_with_type(state, member1, snapshot1, subregion1, member2, snapshot2, subregion2, member.type,
pointer_level))
return true;
}
static bool global_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info,
- simgrid::mc::Region* r1, simgrid::mc::Region* r2, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2)
+ simgrid::mc::Region* r1, simgrid::mc::Region* r2,
+ const simgrid::mc::Snapshot& snapshot1, const simgrid::mc::Snapshot& snapshot2)
{
xbt_assert(r1 && r2, "Missing region.");
- std::vector<simgrid::mc::Variable>& variables = object_info->global_variables;
+ const std::vector<simgrid::mc::Variable>& variables = object_info->global_variables;
for (simgrid::mc::Variable const& current_var : variables) {
continue;
simgrid::mc::Type* bvariable_type = current_var.type;
- if (areas_differ_with_type(state, (char*)current_var.address, snapshot1, r1, (char*)current_var.address, snapshot2,
- r2, bvariable_type, 0)) {
- XBT_VERB("Global variable %s (%p) is different between snapshots",
- current_var.name.c_str(),
- (char *) current_var.address);
+ 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);
return true;
}
}
return false;
}
-static bool local_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1,
- simgrid::mc::Snapshot* snapshot2, mc_snapshot_stack_t stack1,
- mc_snapshot_stack_t stack2)
+static bool local_variables_differ(simgrid::mc::StateComparator& state, const simgrid::mc::Snapshot& snapshot1,
+ const simgrid::mc::Snapshot& snapshot2, const_mc_snapshot_stack_t stack1,
+ const_mc_snapshot_stack_t stack2)
{
if (stack1->local_variables.size() != stack2->local_variables.size()) {
XBT_VERB("Different number of local variables");
}
for (unsigned int cursor = 0; cursor < stack1->local_variables.size(); cursor++) {
- local_variable_t current_var1 = &stack1->local_variables[cursor];
- local_variable_t current_var2 = &stack2->local_variables[cursor];
+ const_local_variable_t current_var1 = &stack1->local_variables[cursor];
+ const_local_variable_t current_var2 = &stack2->local_variables[cursor];
if (current_var1->name != current_var2->name || current_var1->subprogram != current_var2->subprogram ||
current_var1->ip != current_var2->ip) {
// TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram
- XBT_VERB("Different name of variable (%s - %s) "
- "or frame (%s - %s) or ip (%lu - %lu)",
- current_var1->name.c_str(), current_var2->name.c_str(), current_var1->subprogram->name.c_str(),
+ XBT_VERB("Different name of variable (%s - %s) or frame (%s - %s) or ip (%lu - %lu)", current_var1->name.c_str(),
+ current_var2->name.c_str(), current_var1->subprogram->name.c_str(),
current_var2->subprogram->name.c_str(), current_var1->ip, current_var2->ip);
return true;
}
- if (areas_differ_with_type(state, current_var1->address, snapshot1, snapshot1->get_region(current_var1->address),
- current_var2->address, snapshot2, snapshot2->get_region(current_var2->address),
+ if (areas_differ_with_type(state, current_var1->address, snapshot1, snapshot1.get_region(current_var1->address),
+ current_var2->address, snapshot2, snapshot2.get_region(current_var2->address),
current_var1->type, 0)) {
- XBT_VERB("Local variable %s (%p - %p) in frame %s "
- "is different between snapshots",
- current_var1->name.c_str(), current_var1->address, current_var2->address,
- current_var1->subprogram->name.c_str());
+ XBT_VERB("Local variable %s (%p - %p) in frame %s is different between snapshots", current_var1->name.c_str(),
+ current_var1->address, current_var2->address, current_var1->subprogram->name.c_str());
return true;
}
}
namespace simgrid {
namespace mc {
-bool snapshot_equal(Snapshot* s1, Snapshot* s2)
+bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
{
// TODO, make this a field of ModelChecker or something similar
static StateComparator state_comparator;
xbt_mheap_t heap2 =
static_cast<xbt_mheap_t>(s2->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc),
remote(process.heap_address), simgrid::mc::ReadOptions::lazy()));
- if (state_comparator.initHeapInformation(heap1, heap2, &s1->to_ignore_, &s2->to_ignore_) == -1) {
+ 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;
}
/* Stacks comparison */
for (unsigned int cursor = 0; cursor < s1->stacks_.size(); cursor++) {
- mc_snapshot_stack_t stack1 = &s1->stacks_[cursor];
- mc_snapshot_stack_t stack2 = &s2->stacks_[cursor];
+ const_mc_snapshot_stack_t stack1 = &s1->stacks_[cursor];
+ const_mc_snapshot_stack_t stack2 = &s2->stacks_[cursor];
- if (local_variables_differ(state_comparator, s1, s2, stack1, stack2)) {
+ if (local_variables_differ(state_comparator, *s1, *s2, stack1, stack2)) {
XBT_VERB("(%d - %d) Different local variables between stacks %u", s1->num_state_, s2->num_state_, cursor + 1);
return false;
}
xbt_assert(region1->object_info());
/* Compare global variables */
- if (global_variables_differ(state_comparator, region1->object_info(), region1, region2, s1, s2)) {
+ if (global_variables_differ(state_comparator, region1->object_info(), region1, region2, *s1, *s2)) {
std::string const& name = region1->object_info()->file_name;
XBT_VERB("(%d - %d) Different global variables in %s", s1->num_state_, s2->num_state_, name.c_str());
return false;
}
/* Compare heap */
- if (mmalloc_heap_differ(state_comparator, s1, s2)) {
+ if (mmalloc_heap_differ(state_comparator, *s1, *s2)) {
XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_);
return false;
}
