Another use of mc_model_checker disapears. In Snapshot.equals.

[simgrid.git] / src / mc / sosp / Snapshot.hpp

diff --git a/src/mc/sosp/Snapshot.hpp b/src/mc/sosp/Snapshot.hpp
index dec7ffe..d584bdf 100644 (file)
--- a/src/mc/sosp/Snapshot.hpp
+++ b/src/mc/sosp/Snapshot.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2023. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,16 +8,15 @@
 
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/inspect/mc_unw.hpp"
-#include "src/mc/remote/RemoteProcess.hpp"
 #include "src/mc/sosp/Region.hpp"
+#include "src/mc/sosp/RemoteProcessMemory.hpp"
 
 // ***** MC Snapshot
 
 /** Ignored data
  *
- *  Some parts of the snapshot are ignored by zeroing them out: the real
- *  values is stored here.
- * */
+ *  Some parts of the snapshot are ignored by zeroing them out: the real values is stored here.
+ */
 struct s_mc_snapshot_ignored_data_t {
   void* start;
   std::vector<char> data;
@@ -56,15 +55,19 @@ using const_mc_snapshot_stack_t = const s_mc_snapshot_stack_t*;
 
 namespace simgrid::mc {
 
+using hash_type = std::uint64_t;
+
 class XBT_PRIVATE Snapshot final : public AddressSpace {
+  PageStore& page_store_;
+
 public:
   /* Initialization */
-  Snapshot(long num_state, RemoteProcess* process = &mc_model_checker->get_remote_process());
+  Snapshot(long num_state, PageStore& store, RemoteProcessMemory& memory);
 
   /* Regular use */
   bool on_heap(const void* address) const
   {
-    const s_xbt_mheap_t* heap = get_remote_process()->get_heap();
+    const s_xbt_mheap_t* heap = get_remote_process_memory()->get_heap();
     return address >= heap->heapbase && address < heap->breakval;
   }
 
@@ -72,7 +75,9 @@ 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(RemoteProcess* process) const;
+  void restore(RemoteProcessMemory& memory) const;
+
+  bool equals_to(const Snapshot& other, RemoteProcessMemory& memory);
 
   // To be private
   long num_state_;
@@ -86,8 +91,11 @@ public:
 
 private:
   void add_region(RegionType type, ObjectInformation* object_info, void* start_addr, std::size_t size);
-  void snapshot_regions(RemoteProcess* process);
-  void snapshot_stacks(RemoteProcess* 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;
 };
 } // namespace simgrid::mc