MC: Further renamings

[simgrid.git] / src / mc / compare.cpp

diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp
index 1c0d462..dd6b7b9 100644 (file)
--- a/src/mc/compare.cpp
+++ b/src/mc/compare.cpp
@@ -153,7 +153,7 @@ static ssize_t heap_comparison_ignore_size(const std::vector<simgrid::mc::Ignore
 
 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;
@@ -162,7 +162,7 @@ static bool is_stack(const void *address)
 // 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;
@@ -200,7 +200,7 @@ int StateComparator::initHeapInformation(const s_xbt_mheap_t* heap1, const s_xbt
   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;
@@ -220,7 +220,7 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo
 
 static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot1, const Snapshot& snapshot2)
 {
-  const RemoteClientMemory& process = mc_model_checker->process();
+  const RemoteSimulation& process = mc_model_checker->get_remote_simulation();
 
   /* Check busy blocks */
   size_t i1 = 1;
@@ -448,7 +448,7 @@ static bool heap_area_differ_without_type(StateComparator& state, const void* re
                                           const Snapshot& snapshot1, const Snapshot& snapshot2,
                                           HeapLocationPairs* previous, int size, int check_ignore)
 {
-  const RemoteClientMemory& 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);
 
@@ -734,7 +734,7 @@ static Type* get_offset_type(void* real_base_address, Type* type, int offset, in
 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::RemoteClientMemory& process = mc_model_checker->process();
+  const simgrid::mc::RemoteSimulation& process = mc_model_checker->get_remote_simulation();
 
   ssize_t block1;
   ssize_t block2;
@@ -1202,7 +1202,7 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2)
   // TODO, make this a field of ModelChecker or something similar
   static StateComparator state_comparator;
 
-  const RemoteClientMemory& 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_,