MC: remove support for flat storage of regions

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

diff --git a/src/mc/sosp/RegionSnapshot.hpp b/src/mc/sosp/RegionSnapshot.hpp
index a6735e7..6ba6151 100644 (file)
--- a/src/mc/sosp/RegionSnapshot.hpp
+++ b/src/mc/sosp/RegionSnapshot.hpp
@@ -17,55 +17,6 @@ namespace mc {
 
 enum class RegionType { Unknown = 0, Heap = 1, Data = 2 };
 
-enum class StorageType { NoData = 0, Flat = 1, Chunked = 2 };
-
-class Buffer {
-private:
-  void* data_ = nullptr;
-  std::size_t size_;
-
-  explicit Buffer(std::size_t size) : size_(size) { data_ = ::operator new(size_); }
-
-  Buffer(void* data, std::size_t size) : data_(data), size_(size) {}
-
-public:
-  Buffer() = default;
-  void clear() noexcept
-  {
-    ::operator delete(data_);
-    data_ = nullptr;
-    size_ = 0;
-  }
-
-  ~Buffer() noexcept { clear(); }
-
-  static Buffer malloc(std::size_t size) { return Buffer(size); }
-
-  // No copy
-  Buffer(Buffer const& buffer) = delete;
-  Buffer& operator=(Buffer const& buffer) = delete;
-
-  // Move
-  Buffer(Buffer&& that) noexcept : data_(that.data_), size_(that.size_)
-  {
-    that.data_ = nullptr;
-    that.size_ = 0;
-  }
-  Buffer& operator=(Buffer&& that) noexcept
-  {
-    clear();
-    data_      = that.data_;
-    size_      = that.size_;
-    that.data_ = nullptr;
-    that.size_ = 0;
-    return *this;
-  }
-
-  void* get() { return data_; }
-  const void* get() const { return data_; }
-  std::size_t size() const { return size_; }
-};
-
 /** A copy/snapshot of a given memory region
  *
  *  Different types of region snapshot storage types exist:
@@ -92,7 +43,6 @@ public:
 
 protected:
   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 */
@@ -112,7 +62,6 @@ protected:
    * */
   void* permanent_addr_ = nullptr;
 
-  Buffer flat_data_;
   ChunkedData page_numbers_;
 
 public:
@@ -129,12 +78,10 @@ public:
   RegionSnapshot& operator=(RegionSnapshot const&) = delete;
   RegionSnapshot(RegionSnapshot&& that)
       : region_type_(that.region_type_)
-      , storage_type_(that.storage_type_)
       , object_info_(that.object_info_)
       , start_addr_(that.start_addr_)
       , size_(that.size_)
       , permanent_addr_(that.permanent_addr_)
-      , flat_data_(std::move(that.flat_data_))
       , page_numbers_(std::move(that.page_numbers_))
   {
     that.clear();
@@ -142,12 +89,10 @@ public:
   RegionSnapshot& operator=(RegionSnapshot&& that)
   {
     region_type_        = that.region_type_;
-    storage_type_       = that.storage_type_;
     object_info_        = that.object_info_;
     start_addr_         = that.start_addr_;
     size_               = that.size_;
     permanent_addr_     = that.permanent_addr_;
-    flat_data_          = std::move(that.flat_data_);
     page_numbers_       = std::move(that.page_numbers_);
     that.clear();
     return *this;
@@ -158,9 +103,7 @@ public:
   void clear()
   {
     region_type_  = UnknownRegion;
-    storage_type_ = StorageType::NoData;
     page_numbers_.clear();
-    flat_data_.clear();
     object_info_    = nullptr;
     start_addr_     = nullptr;
     size_           = 0;
@@ -169,14 +112,9 @@ public:
 
   void clear_data()
   {
-    storage_type_ = StorageType::NoData;
-    flat_data_.clear();
     page_numbers_.clear();
   }
 
-  const Buffer& flat_data() const { return flat_data_; }
-  Buffer& flat_data() { return flat_data_; }
-
   ChunkedData const& page_data() const { return page_numbers_; }
 
   simgrid::mc::ObjectInformation* object_info() const { return object_info_; }
@@ -188,7 +126,6 @@ public:
   RemotePtr<void> end() const { return remote((char*)start_addr_ + size_); }
   RemotePtr<void> permanent_address() const { return remote(permanent_addr_); }
   std::size_t size() const { return size_; }
-  StorageType storage_type() const { return storage_type_; }
   RegionType region_type() const { return region_type_; }
 
   bool contain(RemotePtr<void> p) const { return p >= start() && p < end(); }
@@ -197,10 +134,6 @@ public:
   void restore();
 };
 
-class RegionDense : public RegionSnapshot {
-public:
-  RegionDense(RegionType type, void* start_addr, void* data_addr, std::size_t size);
-};
 class RegionSparse : public RegionSnapshot {
 public:
   RegionSparse(RegionType type, void* start_addr, void* data_addr, std::size_t size);