mc: privatized regions now use a vector of pointers for sake of homogeneity

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

diff --git a/src/mc/sosp/RegionSnapshot.hpp b/src/mc/sosp/RegionSnapshot.hpp
index 8db62e4..87996d7 100644 (file)
--- a/src/mc/sosp/RegionSnapshot.hpp
+++ b/src/mc/sosp/RegionSnapshot.hpp
@@ -31,7 +31,7 @@ private:
   void* data_ = nullptr;
   std::size_t size_;
 
-  Buffer(std::size_t size) : size_(size) { data_ = ::operator new(size_); }
+  explicit Buffer(std::size_t size) : size_(size) { data_ = ::operator new(size_); }
 
   Buffer(void* data, std::size_t size) : data_(data), size_(size) {}
 
@@ -98,15 +98,15 @@ public:
   static const RegionType DataRegion    = RegionType::Data;
 
 private:
-  RegionType region_type_;
-  StorageType storage_type_;
-  simgrid::mc::ObjectInformation* object_info_;
+  RegionType region_type_                      = UnknownRegion;
+  StorageType storage_type_                    = StorageType::NoData;
+  simgrid::mc::ObjectInformation* object_info_ = nullptr;
 
   /** @brief  Virtual address of the region in the simulated process */
-  void* start_addr_;
+  void* start_addr_ = nullptr;
 
   /** @brief Size of the data region in bytes */
-  std::size_t size_;
+  std::size_t size_ = 0;
 
   /** @brief Permanent virtual address of the region
    *
@@ -117,26 +117,16 @@ private:
    * on the region of the global variables.
    *
    * */
-  void* permanent_addr_;
+  void* permanent_addr_ = nullptr;
 
   Buffer flat_data_;
   ChunkedData page_numbers_;
-  std::vector<RegionSnapshot> privatized_regions_;
+  std::vector<std::unique_ptr<RegionSnapshot>> privatized_regions_;
 
 public:
-  RegionSnapshot()
-      : region_type_(UnknownRegion)
-      , storage_type_(StorageType::NoData)
-      , object_info_(nullptr)
-      , start_addr_(nullptr)
-      , size_(0)
-      , permanent_addr_(nullptr)
-  {
-  }
+  RegionSnapshot() {}
   RegionSnapshot(RegionType type, void* start_addr, void* permanent_addr, size_t size)
       : region_type_(type)
-      , storage_type_(StorageType::NoData)
-      , object_info_(nullptr)
       , start_addr_(start_addr)
       , size_(size)
       , permanent_addr_(permanent_addr)
@@ -215,15 +205,15 @@ public:
   }
   ChunkedData const& page_data() const { return page_numbers_; }
 
-  void privatized_data(std::vector<RegionSnapshot> data)
+  void privatized_data(std::vector<std::unique_ptr<RegionSnapshot>> data)
   {
     storage_type_ = StorageType::Privatized;
     flat_data_.clear();
     page_numbers_.clear();
     privatized_regions_ = std::move(data);
   }
-  std::vector<RegionSnapshot> const& privatized_data() const { return privatized_regions_; }
-  std::vector<RegionSnapshot>& privatized_data() { return privatized_regions_; }
+  std::vector<std::unique_ptr<RegionSnapshot>> const& privatized_data() const { return privatized_regions_; }
+  std::vector<std::unique_ptr<RegionSnapshot>>& privatized_data() { return privatized_regions_; }
 
   simgrid::mc::ObjectInformation* object_info() const { return object_info_; }
   void object_info(simgrid::mc::ObjectInformation* info) { object_info_ = info; }
@@ -242,8 +232,8 @@ public:
 
 RegionSnapshot privatized_region(RegionType region_type, void* start_addr, void* permanent_addr, std::size_t size);
 RegionSnapshot dense_region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
-simgrid::mc::RegionSnapshot sparse_region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
-simgrid::mc::RegionSnapshot region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
+RegionSnapshot sparse_region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
+RegionSnapshot region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
 
 } // namespace mc
 } // namespace simgrid