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;
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;
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();
+ 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);
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;
} 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));
// 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;
const simgrid::mc::Type* bvariable_type = current_var.type;
// 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_,