mc: cosmetics

diff --git a/src/mc/sosp/RegionSnapshot.cpp b/src/mc/sosp/RegionSnapshot.cpp
index c9388e7..f9d07da 100644 (file)
--- a/src/mc/sosp/RegionSnapshot.cpp
+++ b/src/mc/sosp/RegionSnapshot.cpp
@@ -31,7 +31,7 @@ RegionSnapshot::RegionSnapshot(RegionType region_type, void* start_addr, void* p
   xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize - 1)) == 0,
              "Permanent address not at the beginning of a page");
 
-  page_numbers_ =
+  chunks_ =
       ChunkedData(mc_model_checker->page_store(), *process, RemotePtr<void>(permanent_addr), mmu::chunk_count(size));
 }
 
@@ -42,11 +42,11 @@ RegionSnapshot::RegionSnapshot(RegionType region_type, void* start_addr, void* p
 void RegionSnapshot::restore()
 {
       xbt_assert(((permanent_address().address()) & (xbt_pagesize - 1)) == 0, "Not at the beginning of a page");
-      xbt_assert(simgrid::mc::mmu::chunk_count(size()) == page_data().page_count());
+      xbt_assert(simgrid::mc::mmu::chunk_count(size()) == chunks().page_count());
 
-      for (size_t i = 0; i != page_data().page_count(); ++i) {
+      for (size_t i = 0; i != chunks().page_count(); ++i) {
         void* target_page = (void*)simgrid::mc::mmu::join(i, (std::uintptr_t)(void*)permanent_address().address());
-        const void* source_page = page_data().page(i);
+        const void* source_page = chunks().page(i);
         mc_model_checker->process().write_bytes(source_page, xbt_pagesize, remote(target_page));
       }
 }

diff --git a/src/mc/sosp/RegionSnapshot.hpp b/src/mc/sosp/RegionSnapshot.hpp
index b194a80..edcc51c 100644 (file)
--- a/src/mc/sosp/RegionSnapshot.hpp
+++ b/src/mc/sosp/RegionSnapshot.hpp
@@ -45,7 +45,7 @@ protected:
    * */
   void* permanent_addr_ = nullptr;
 
-  ChunkedData page_numbers_;
+  ChunkedData chunks_;
 
 public:
   RegionSnapshot(RegionType type, void* start_addr, void* permanent_addr, size_t size);
@@ -58,7 +58,7 @@ public:
       , start_addr_(that.start_addr_)
       , size_(that.size_)
       , permanent_addr_(that.permanent_addr_)
-      , page_numbers_(std::move(that.page_numbers_))
+      , chunks_(std::move(that.chunks_))
   {
     that.clear();
   }
@@ -69,7 +69,7 @@ public:
     start_addr_         = that.start_addr_;
     size_               = that.size_;
     permanent_addr_     = that.permanent_addr_;
-    page_numbers_       = std::move(that.page_numbers_);
+    chunks_             = std::move(that.chunks_);
     that.clear();
     return *this;
   }
@@ -79,19 +79,14 @@ public:
   void clear()
   {
     region_type_  = UnknownRegion;
-    page_numbers_.clear();
+    chunks_.clear();
     object_info_    = nullptr;
     start_addr_     = nullptr;
     size_           = 0;
     permanent_addr_ = nullptr;
   }
 
-  void clear_data()
-  {
-    page_numbers_.clear();
-  }
-
-  ChunkedData const& page_data() const { return page_numbers_; }
+  ChunkedData const& chunks() const { return chunks_; }
 
   simgrid::mc::ObjectInformation* object_info() const { return object_info_; }
   void object_info(simgrid::mc::ObjectInformation* info) { object_info_ = info; }

diff --git a/src/mc/sosp/mc_snapshot.hpp b/src/mc/sosp/mc_snapshot.hpp
index 5ecafac..5bc51ad 100644 (file)
--- a/src/mc/sosp/mc_snapshot.hpp
+++ b/src/mc/sosp/mc_snapshot.hpp
@@ -18,7 +18,7 @@ static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, simgr
   auto split                = simgrid::mc::mmu::split(addr - region->start().address());
   auto pageno               = split.first;
   auto offset               = split.second;
-  const void* snapshot_page = region->page_data().page(pageno);
+  const void* snapshot_page = region->chunks().page(pageno);
   return (char*)snapshot_page + offset;
 }