Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
MC::Region: Also remove the permanent_addr thingy
[simgrid.git] / src / mc / sosp / RegionSnapshot.hpp
index d8bfe0b..4fd5287 100644 (file)
@@ -17,73 +17,7 @@ namespace mc {
 
 enum class RegionType { Unknown = 0, Heap = 1, Data = 2 };
 
-enum class StorageType { NoData = 0, Flat = 1, Chunked = 2, Privatized = 3 };
-
-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:
- *
- *  * flat/dense snapshots are a simple copy of the region;
- *
- *  * sparse/per-page snapshots are snaapshots which shared
- *    identical pages.
- *
- *  * privatized (SMPI global variable privatization).
- *
- *  This is handled with a variant based approach:
- *
- *  * `storage_type` identified the type of storage;
- *
- *  * an anonymous enum is used to distinguish the relevant types for
- *    each type.
- */
+/** A copy/snapshot of a given memory region, where identical pages are stored only once */
 class RegionSnapshot {
 public:
   static const RegionType UnknownRegion = RegionType::Unknown;
@@ -92,7 +26,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 */
@@ -101,57 +34,29 @@ protected:
   /** @brief Size of the data region in bytes */
   std::size_t size_ = 0;
 
-  /** @brief Permanent virtual address of the region
-   *
-   * This is usually the same address as the simuilated process address.
-   * However, when using SMPI privatization of global variables,
-   * each SMPI process has its own set of global variables stored
-   * at a different virtual address. The scheduler maps those region
-   * on the region of the global variables.
-   *
-   * */
-  void* permanent_addr_ = nullptr;
-
-  Buffer flat_data_;
-  ChunkedData page_numbers_;
-  std::vector<std::unique_ptr<RegionSnapshot>> privatized_regions_;
+  ChunkedData chunks_;
 
 public:
-  RegionSnapshot() {}
-  RegionSnapshot(RegionType type, void* start_addr, void* permanent_addr, size_t size)
-      : region_type_(type)
-      , start_addr_(start_addr)
-      , size_(size)
-      , permanent_addr_(permanent_addr)
-  {
-  }
+  RegionSnapshot(RegionType type, void* start_addr, size_t size);
   ~RegionSnapshot()                     = default;
   RegionSnapshot(RegionSnapshot const&) = delete;
   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_))
-      , privatized_regions_(std::move(that.privatized_regions_))
+      , chunks_(std::move(that.chunks_))
   {
     that.clear();
   }
   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_);
-    privatized_regions_ = std::move(that.privatized_regions_);
+    chunks_             = std::move(that.chunks_);
     that.clear();
     return *this;
   }
@@ -161,31 +66,13 @@ public:
   void clear()
   {
     region_type_  = UnknownRegion;
-    storage_type_ = StorageType::NoData;
-    privatized_regions_.clear();
-    page_numbers_.clear();
-    flat_data_.clear();
+    chunks_.clear();
     object_info_    = nullptr;
     start_addr_     = nullptr;
     size_           = 0;
-    permanent_addr_ = nullptr;
   }
 
-  void clear_data()
-  {
-    storage_type_ = StorageType::NoData;
-    flat_data_.clear();
-    page_numbers_.clear();
-    privatized_regions_.clear();
-  }
-
-  const Buffer& flat_data() const { return flat_data_; }
-  Buffer& flat_data() { return flat_data_; }
-
-  ChunkedData const& page_data() const { return page_numbers_; }
-
-  std::vector<std::unique_ptr<RegionSnapshot>> const& privatized_data() const { return privatized_regions_; }
-  std::vector<std::unique_ptr<RegionSnapshot>>& privatized_data() { return privatized_regions_; }
+  ChunkedData const& get_chunks() const { return chunks_; }
 
   simgrid::mc::ObjectInformation* object_info() const { return object_info_; }
   void object_info(simgrid::mc::ObjectInformation* info) { object_info_ = info; }
@@ -194,9 +81,7 @@ public:
 
   RemotePtr<void> start() const { return remote(start_addr_); }
   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(); }
@@ -205,21 +90,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);
-};
-class RegionPrivatized : public RegionSnapshot {
-public:
-  RegionPrivatized(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