std::vector<HeapArea> equals_to;
std::vector<simgrid::mc::Type*> types;
std::size_t heapsize = 0;
std::vector<HeapArea> equals_to;
std::vector<simgrid::mc::Type*> types;
std::size_t heapsize = 0;
- 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);
-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)
-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)
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,
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)
-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)
* @return true when different, false otherwise (same or unknown)
*/
static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, const void* real_area1,
* @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,
- 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 char*)real_area1 + pointer_align)));
+ const void* addr_pointed2 = snapshot2.read(remote((void**)((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 *);
if (process.in_maestro_stack(remote(addr_pointed1)) && process.in_maestro_stack(remote(addr_pointed2))) {
i = pointer_align + sizeof(void *);
* @return true when different, false otherwise (same or unknown)
*/
static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
* @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
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) {
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));
- 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));
if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2))
return heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
pointer_level);
if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2))
return heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype,
pointer_level);
- 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*))));
+ 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)
? heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous,
type->subtype, pointer_level)
bool differ = is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)
? heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous,
type->subtype, pointer_level)
} else {
for (simgrid::mc::Member& member : type->members) {
// TODO, optimize this? (for the offset case)
} 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;
if (heap_area_differ_with_type(state, real_member1, real_member2, snapshot1, snapshot2, previous,
member.type, -1, check_ignore, 0))
return true;
* @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,
* @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,
- 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);
* @return true when different, false otherwise (same or unknown)
*/
static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* area1, const void* area2,
* @return true when different, false otherwise (same or unknown)
*/
static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* area1, const void* area2,
HeapLocationPairs* previous, simgrid::mc::Type* type, int pointer_level)
{
const simgrid::mc::RemoteClient& process = mc_model_checker->process();
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;
// 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));
/******************************************************************************/
static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1,
/******************************************************************************/
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;
simgrid::mc::Region* region2, simgrid::mc::Type* type, int pointer_level)
{
simgrid::mc::Type* subtype;
- 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;
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,
}
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)
-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");
{
if (stack1->local_variables.size() != stack2->local_variables.size()) {
XBT_VERB("Different number of local variables");
- 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
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
- 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->type, 0)) {
XBT_VERB("Local variable %s (%p - %p) in frame %s "
"is different between snapshots",
{
// TODO, make this a field of ModelChecker or something similar
static StateComparator state_comparator;
{
// 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()));
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++) {
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_VERB("(%d - %d) Different local variables between stacks %u", s1->num_state_, s2->num_state_, cursor + 1);
return false;
}
- 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;
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;