[mc] Cleanup RegionSnapshot buffer code

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

diff --git a/src/mc/RegionSnapshot.hpp b/src/mc/RegionSnapshot.hpp
index 9a9b219..f1007ac 100644 (file)
--- a/src/mc/RegionSnapshot.hpp
+++ b/src/mc/RegionSnapshot.hpp
@@ -10,11 +10,15 @@
 #include <cstddef>
 #include <utility>
 
+#include <memory>
+#include <vector>
+
 #include <xbt/base.h>
 
-#include <mc/PageStore.hpp>
-#include <mc/AddressSpace.hpp>
-#include <mc/ChunkedData.hpp>
+#include "src/mc/remote_ptr.hpp"
+#include "src/mc/PageStore.hpp"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/ChunkedData.hpp"
 
 namespace simgrid {
 namespace mc {
@@ -33,22 +37,53 @@ enum class StorageType {
   Privatized = 3
 };
 
-class data_deleter {
+class buffer {
 public:
-  enum Type {
-    Free,
-    Munmap
+  enum class Type {
+    Malloc,
+    Mmap
   };
 private:
-  Type type_;
+  void* data_ = nullptr;
   std::size_t size_;
+  Type type_ = Type::Malloc;
 public:
-  data_deleter() : type_(Free) {}
-  data_deleter(Type type, std::size_t size) : type_(type), size_(size) {}
-  void operator()(void* p) const;
-};
+  buffer() {}
+  buffer(std::size_t size, Type type = Type::Malloc);
+  buffer(void* data, std::size_t size, Type type = Type::Malloc) :
+    data_(data), size_(size), type_(type) {}
+  void clear() noexcept;
+  ~buffer() noexcept { clear(); }
+
+  // No copy
+  buffer(buffer const& buffer) = delete;
+  buffer& operator=(buffer const& buffer) = delete;
+
+  // Move
+  buffer(buffer&& that) noexcept
+    : data_(that.data_), size_(that.size_), type_(that.type_)
+  {
+    that.data_ = nullptr;
+    that.size_ = 0;
+    that.type_ = Type::Malloc;
+  }
+  buffer& operator=(buffer&& that) noexcept
+  {
+    clear();
+    data_ = that.data_;
+    size_ = that.size_;
+    type_ = that.type_;
+    that.data_ = nullptr;
+    that.size_ = 0;
+    that.type_ = Type::Malloc;
+    return *this;
+  }
 
-typedef std::unique_ptr<char[], data_deleter> unique_data_ptr;
+  void* get()              { return data_; }
+  const void* get()  const { return data_; }
+  std::size_t size() const { return size_; }
+  Type type()        const { return type_; }
+};
 
 /** A copy/snapshot of a given memory region
  *
@@ -73,8 +108,6 @@ public:
   static const RegionType UnknownRegion = RegionType::Unknown;
   static const RegionType HeapRegion = RegionType::Heap;
   static const RegionType DataRegion = RegionType::Data;
-public:
-  typedef unique_data_ptr flat_data_ptr;
 private:
   RegionType region_type_;
   StorageType storage_type_;
@@ -97,7 +130,7 @@ private:
    * */
   void *permanent_addr_;
 
-  flat_data_ptr flat_data_;
+  buffer flat_data_;
   ChunkedData page_numbers_;
   std::vector<RegionSnapshot> privatized_regions_;
 public:
@@ -156,7 +189,7 @@ public:
     storage_type_ = StorageType::NoData;
     privatized_regions_.clear();
     page_numbers_.clear();
-    flat_data_.reset();
+    flat_data_.clear();
     object_info_ = nullptr;
     start_addr_ = nullptr;
     size_ = 0;
@@ -166,24 +199,25 @@ public:
   void clear_data()
   {
     storage_type_ = StorageType::NoData;
-    flat_data_.reset();
+    flat_data_.clear();
     page_numbers_.clear();
     privatized_regions_.clear();
   }
   
-  void flat_data(flat_data_ptr data)
+  void flat_data(buffer data)
   {
     storage_type_ = StorageType::Flat;
     flat_data_ = std::move(data);
     page_numbers_.clear();
     privatized_regions_.clear();
   }
-  const char* flat_data() const { return flat_data_.get(); }
+  const buffer& flat_data() const { return flat_data_; }
+  buffer& flat_data()             { return flat_data_; }
 
   void page_data(ChunkedData page_data)
   {
     storage_type_ = StorageType::Chunked;
-    flat_data_.reset();
+    flat_data_.clear();
     page_numbers_ = std::move(page_data);
     privatized_regions_.clear();
   }
@@ -192,7 +226,7 @@ public:
   void privatized_data(std::vector<RegionSnapshot> data)
   {
     storage_type_ = StorageType::Privatized;
-    flat_data_.reset();
+    flat_data_.clear();
     page_numbers_.clear();
     privatized_regions_ = std::move(data);
   }
@@ -224,7 +258,8 @@ public:
 };
 
 RegionSnapshot privatized_region(
-  RegionType type, void *start_addr, void* data_addr, std::size_t size);
+    RegionType region_type, void *start_addr, void* permanent_addr,
+    std::size_t size, const RegionSnapshot* ref_region);
 RegionSnapshot dense_region(
   RegionType type, void *start_addr, void* data_addr, std::size_t size);
 simgrid::mc::RegionSnapshot sparse_region(