Give the remote_process_memory to the mc::State constructor

This way, we rely a bit less on the ugly mc_model_checker singleton.

diff --git a/src/mc/VisitedState.cpp b/src/mc/VisitedState.cpp
index 3902d91..b974d01 100644 (file)
--- a/src/mc/VisitedState.cpp
+++ b/src/mc/VisitedState.cpp
@@ -23,7 +23,8 @@ VisitedState::VisitedState(unsigned long state_number, unsigned int actor_count,
     , actor_count_(actor_count)
     , num_(state_number)
 {
-  this->system_state_ = std::make_shared<simgrid::mc::Snapshot>(state_number, remote_app.get_page_store());
+  this->system_state_ = std::make_shared<simgrid::mc::Snapshot>(state_number, remote_app.get_page_store(),
+                                                                remote_app.get_remote_process_memory());
 }
 
 void VisitedStates::prune()

diff --git a/src/mc/api/RemoteApp.cpp b/src/mc/api/RemoteApp.cpp
index 6b53a00..31637db 100644 (file)
--- a/src/mc/api/RemoteApp.cpp
+++ b/src/mc/api/RemoteApp.cpp
@@ -136,7 +136,8 @@ RemoteApp::RemoteApp(const std::vector<char*>& args)
 
   /* Take the initial snapshot */
   wait_for_requests();
-  initial_snapshot_ = std::make_shared<simgrid::mc::Snapshot>(0, page_store_);
+  initial_snapshot_ =
+      std::make_shared<simgrid::mc::Snapshot>(0, page_store_, model_checker_->get_remote_process_memory());
 }
 
 RemoteApp::~RemoteApp()
@@ -151,7 +152,7 @@ RemoteApp::~RemoteApp()
 
 void RemoteApp::restore_initial_state() const
 {
-  this->initial_snapshot_->restore(&model_checker_->get_remote_process_memory());
+  this->initial_snapshot_->restore(model_checker_->get_remote_process_memory());
 }
 
 unsigned long RemoteApp::get_maxpid() const

diff --git a/src/mc/api/State.cpp b/src/mc/api/State.cpp
index 77973c9..8894219 100644 (file)
--- a/src/mc/api/State.cpp
+++ b/src/mc/api/State.cpp
@@ -21,7 +21,8 @@ State::State(RemoteApp& remote_app) : num_(++expended_states_)
 
   /* Stateful model checking */
   if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination)
-    system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_, remote_app.get_page_store());
+    system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_, remote_app.get_page_store(),
+                                                            remote_app.get_remote_process_memory());
 }
 
 State::State(RemoteApp& remote_app, const State* previous_state)
@@ -33,9 +34,9 @@ State::State(RemoteApp& remote_app, const State* previous_state)
   transition_ = default_transition_.get();
 
   /* Stateful model checking */
-  if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination) {
-    system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_, remote_app.get_page_store());
-  }
+  if ((_sg_mc_checkpoint > 0 && (num_ % _sg_mc_checkpoint == 0)) || _sg_mc_termination)
+    system_state_ = std::make_shared<simgrid::mc::Snapshot>(num_, remote_app.get_page_store(),
+                                                            remote_app.get_remote_process_memory());
 
   /* For each actor in the previous sleep set, keep it if it is not dependent with current transition.
    * And if we kept it and the actor is enabled in this state, mark the actor as already done, so that

diff --git a/src/mc/explo/DFSExplorer.cpp b/src/mc/explo/DFSExplorer.cpp
index 4602fdf..aea0570 100644 (file)
--- a/src/mc/explo/DFSExplorer.cpp
+++ b/src/mc/explo/DFSExplorer.cpp
@@ -279,7 +279,7 @@ void DFSExplorer::backtrack()
     /* If asked to rollback on a state that has a snapshot, restore it */
     State* last_state = stack_.back().get();
     if (const auto* system_state = last_state->get_system_state()) {
-      system_state->restore(&get_remote_app().get_remote_process_memory());
+      system_state->restore(get_remote_app().get_remote_process_memory());
       on_restore_system_state_signal(last_state, get_remote_app());
       return;
     }

diff --git a/src/mc/explo/LivenessChecker.cpp b/src/mc/explo/LivenessChecker.cpp
index 6a43409..4a61c07 100644 (file)
--- a/src/mc/explo/LivenessChecker.cpp
+++ b/src/mc/explo/LivenessChecker.cpp
@@ -23,10 +23,11 @@ VisitedPair::VisitedPair(int pair_num, xbt_automaton_state_t prop_state,
                          RemoteApp& remote_app)
     : num(pair_num), prop_state_(prop_state)
 {
+  auto& memory     = mc_model_checker->get_remote_process_memory();
   this->app_state_ = std::move(app_state);
   if (not this->app_state_->get_system_state())
-    this->app_state_->set_system_state(std::make_shared<Snapshot>(pair_num, remote_app.get_page_store()));
-  this->heap_bytes_used     = mc_model_checker->get_remote_process_memory().get_remote_heap_bytes();
+    this->app_state_->set_system_state(std::make_shared<Snapshot>(pair_num, remote_app.get_page_store(), memory));
+  this->heap_bytes_used     = memory.get_remote_heap_bytes();
   this->actor_count_        = app_state_->get_actor_count();
   this->other_num           = -1;
   this->atomic_propositions = std::move(atomic_propositions);
@@ -102,7 +103,7 @@ void LivenessChecker::replay()
   if (_sg_mc_checkpoint > 0) {
     const Pair* pair = exploration_stack_.back().get();
     if (const auto* system_state = pair->app_state_->get_system_state()) {
-      system_state->restore(&get_remote_app().get_remote_process_memory());
+      system_state->restore(get_remote_app().get_remote_process_memory());
       return;
     }
   }

diff --git a/src/mc/inspect/mc_unw.cpp b/src/mc/inspect/mc_unw.cpp
index 1b66c85..d9882f0 100644 (file)
--- a/src/mc/inspect/mc_unw.cpp
+++ b/src/mc/inspect/mc_unw.cpp
@@ -216,10 +216,10 @@ unw_addr_space_t UnwindContext::createUnwindAddressSpace()
   return unw_create_addr_space(&accessors, BYTE_ORDER);
 }
 
-void UnwindContext::initialize(simgrid::mc::RemoteProcessMemory* process, unw_context_t* c)
+void UnwindContext::initialize(simgrid::mc::RemoteProcessMemory& process_memory, unw_context_t* c)
 {
-  this->address_space_ = process;
-  this->process_      = process;
+  this->address_space_ = &process_memory;
+  this->process_       = &process_memory;
 
   // Take a copy of the context for our own purpose:
   this->unwind_context_ = *c;

diff --git a/src/mc/inspect/mc_unw.hpp b/src/mc/inspect/mc_unw.hpp
index 148591a..7b9babb 100644 (file)
--- a/src/mc/inspect/mc_unw.hpp
+++ b/src/mc/inspect/mc_unw.hpp
@@ -45,7 +45,7 @@ class UnwindContext {
   unw_context_t unwind_context_              = {};
 
 public:
-  void initialize(simgrid::mc::RemoteProcessMemory* process, unw_context_t* c);
+  void initialize(simgrid::mc::RemoteProcessMemory& process, unw_context_t* c);
   unw_cursor_t cursor();
 
 private: // Methods and virtual table for libunwind

diff --git a/src/mc/sosp/Snapshot.cpp b/src/mc/sosp/Snapshot.cpp
index be64dff..08b1a97 100644 (file)
--- a/src/mc/sosp/Snapshot.cpp
+++ b/src/mc/sosp/Snapshot.cpp
@@ -13,19 +13,19 @@ namespace simgrid::mc {
 /************************************* Take Snapshot ************************************/
 /****************************************************************************************/
 
-void Snapshot::snapshot_regions(RemoteProcessMemory* process)
+void Snapshot::snapshot_regions(RemoteProcessMemory& process_memory)
 {
   snapshot_regions_.clear();
 
-  for (auto const& object_info : process->object_infos)
+  for (auto const& object_info : process_memory.object_infos)
     add_region(RegionType::Data, object_info.get(), object_info->start_rw, object_info->end_rw - object_info->start_rw);
 
-  const s_xbt_mheap_t* heap = process->get_heap();
+  const s_xbt_mheap_t* heap = process_memory.get_heap();
   void* start_heap = heap->base;
   void* end_heap   = heap->breakval;
 
   add_region(RegionType::Heap, nullptr, start_heap, (char*)end_heap - (char*)start_heap);
-  heap_bytes_used_ = mmalloc_get_bytes_used_remote(heap->heaplimit, process->get_malloc_info());
+  heap_bytes_used_ = mmalloc_get_bytes_used_remote(heap->heaplimit, process_memory.get_malloc_info());
 }
 
 /** @brief Checks whether the variable is in scope for a given IP.
@@ -99,7 +99,7 @@ static std::vector<s_local_variable_t> get_local_variables_values(std::vector<s_
 
 static std::vector<s_mc_stack_frame_t> unwind_stack_frames(UnwindContext* stack_context)
 {
-  const RemoteProcessMemory* process = &mc_model_checker->get_remote_process_memory();
+  const RemoteProcessMemory* process_memory = &mc_model_checker->get_remote_process_memory();
   std::vector<s_mc_stack_frame_t> result;
 
   unw_cursor_t c = stack_context->cursor();
@@ -122,7 +122,7 @@ static std::vector<s_mc_stack_frame_t> unwind_stack_frames(UnwindContext* stack_
 
     // TODO, use real addresses in frame_t instead of fixing it here
 
-    Frame* frame              = process->find_function(remote(ip));
+    Frame* frame              = process_memory->find_function(remote(ip));
     stack_frame.frame         = frame;
 
     if (frame) {
@@ -149,16 +149,16 @@ static std::vector<s_mc_stack_frame_t> unwind_stack_frames(UnwindContext* stack_
   return result;
 }
 
-void Snapshot::snapshot_stacks(RemoteProcessMemory* process)
+void Snapshot::snapshot_stacks(RemoteProcessMemory& process_memory)
 {
-  for (auto const& stack : process->stack_areas()) {
+  for (auto const& stack : process_memory.stack_areas()) {
     s_mc_snapshot_stack_t st;
 
-    // Read the context from remote process:
+    // Read the context from remote process memory:
     unw_context_t context;
-    process->read_bytes(&context, sizeof(context), remote(stack.context));
+    process_memory.read_bytes(&context, sizeof(context), remote(stack.context));
 
-    st.context.initialize(process, &context);
+    st.context.initialize(process_memory, &context);
 
     st.stack_frames    = unwind_stack_frames(&st.context);
     st.local_variables = get_local_variables_values(st.stack_frames);
@@ -198,20 +198,20 @@ void Snapshot::ignore_restore() const
                                              remote(ignored_data.start));
 }
 
-Snapshot::Snapshot(long num_state, PageStore& store, RemoteProcessMemory* process)
-    : AddressSpace(process), page_store_(store), num_state_(num_state)
+Snapshot::Snapshot(long num_state, PageStore& store, RemoteProcessMemory& memory)
+    : AddressSpace(memory), page_store_(store), num_state_(num_state)
 {
   XBT_DEBUG("Taking snapshot %ld", num_state);
 
   handle_ignore();
 
   /* Save the std heap and the writable mapped pages of libsimgrid and binary */
-  snapshot_regions(process);
+  snapshot_regions(memory);
 
-  to_ignore_ = process->ignored_heap();
+  to_ignore_ = memory.ignored_heap();
 
   if (_sg_mc_max_visited_states > 0 || not _sg_mc_property_file.get().empty()) {
-    snapshot_stacks(process);
+    snapshot_stacks(memory);
     hash_ = this->do_hash();
   }
 
@@ -271,7 +271,7 @@ Region* Snapshot::get_region(const void* addr, Region* hinted_region) const
     return get_region(addr);
 }
 
-void Snapshot::restore(RemoteProcessMemory* process) const
+void Snapshot::restore(RemoteProcessMemory& memory) const
 {
   XBT_DEBUG("Restore snapshot %ld", num_state_);
 
@@ -282,7 +282,7 @@ void Snapshot::restore(RemoteProcessMemory* process) const
   }
 
   ignore_restore();
-  process->clear_cache();
+  memory.clear_cache();
 }
 
 /* ----------- Hashing logic -------------- */

diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp
index 8f8c437..6066335 100644 (file)
--- a/src/mc/sosp/Snapshot.hpp
+++ b/src/mc/sosp/Snapshot.hpp
@@ -62,8 +62,7 @@ class XBT_PRIVATE Snapshot final : public AddressSpace {
 
 public:
   /* Initialization */
-  Snapshot(long num_state, PageStore& store,
-           RemoteProcessMemory* process = &mc_model_checker->get_remote_process_memory());
+  Snapshot(long num_state, PageStore& store, RemoteProcessMemory& memory);
 
   /* Regular use */
   bool on_heap(const void* address) const
@@ -76,7 +75,7 @@ public:
                    ReadOptions options = ReadOptions::none()) const override;
   Region* get_region(const void* addr) const;
   Region* get_region(const void* addr, Region* hinted_region) const;
-  void restore(RemoteProcessMemory* process) const;
+  void restore(RemoteProcessMemory& memory) const;
 
   bool operator==(const Snapshot& other);
   bool operator!=(const Snapshot& other) { return not(*this == other); }
@@ -93,8 +92,8 @@ public:
 
 private:
   void add_region(RegionType type, ObjectInformation* object_info, void* start_addr, std::size_t size);
-  void snapshot_regions(RemoteProcessMemory* process);
-  void snapshot_stacks(RemoteProcessMemory* process);
+  void snapshot_regions(RemoteProcessMemory& process_memory);
+  void snapshot_stacks(RemoteProcessMemory& process_memory);
   void handle_ignore();
   void ignore_restore() const;
   hash_type do_hash() const;