/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#ifndef SIMGRID_MC_REGION_SNAPSHOT_HPP
+#define SIMGRID_MC_REGION_SNAPSHOT_HPP
+
#include <cstddef>
#include <utility>
+#include <xbt/base.h>
+
#include "PageStore.hpp"
#include "AddressSpace.hpp"
-#ifndef SIMGRID_MC_REGION_SNAPSHOT_HPP
-#define SIMGRID_MC_REGION_SNAPSHOT_HPP
-
-typedef enum e_mc_region_type_t {
- MC_REGION_TYPE_UNKNOWN = 0,
- MC_REGION_TYPE_HEAP = 1,
- MC_REGION_TYPE_DATA = 2
-} mc_region_type_t;
-
-// TODO, use OO instead of this
-typedef enum e_mc_region_storage_type_t {
- MC_REGION_STORAGE_TYPE_NONE = 0,
- MC_REGION_STORAGE_TYPE_FLAT = 1,
- MC_REGION_STORAGE_TYPE_CHUNKED = 2,
- MC_REGION_STORAGE_TYPE_PRIVATIZED = 3
-} mc_region_storage_type_t;
-
namespace simgrid {
namespace mc {
return pagenos_[i];
}
+ const std::size_t* pagenos() const { return pagenos_.data(); }
+ std::size_t* pagenos() { return pagenos_.data(); }
+
const void* page(std::size_t i) const
{
return store_->get_page(pagenos_[i]);
}
PerPageCopy(PageStore& store, AddressSpace& as,
- remote_ptr<void> addr, std::size_t page_count);
+ remote_ptr<void> addr, std::size_t page_count,
+ const size_t* ref_page_numbers, const std::uint64_t* pagemap);
+};
+
+enum class RegionType {
+ Unknown = 0,
+ Heap = 1,
+ Data = 2
+};
+
+// TODO, use Boost.Variant instead of this
+enum class StorageType {
+ NoData = 0,
+ Flat = 1,
+ Chunked = 2,
+ Privatized = 3
+};
+
+class data_deleter {
+public:
+ enum Type {
+ Free,
+ Munmap
+ };
+private:
+ Type type_;
+ std::size_t size_;
+public:
+ data_deleter() : type_(Free) {}
+ data_deleter(Type type, std::size_t size) : type_(type), size_(size) {}
+ void operator()(void* p) const;
};
/** @brief Copy/snapshot of a given memory region
* each type.
*/
class RegionSnapshot {
+public:
+ static const RegionType UnknownRegion = RegionType::Unknown;
+ static const RegionType HeapRegion = RegionType::Heap;
+ static const RegionType DataRegion = RegionType::Data;
+ static const StorageType NoData = StorageType::NoData;
+ static const StorageType FlatData = StorageType::Flat;
+ static const StorageType ChunkedData = StorageType::Chunked;
+ static const StorageType PrivatizedData = StorageType::Privatized;
+public:
+ typedef std::unique_ptr<char[], data_deleter> flat_data_ptr;
private:
- mc_region_type_t region_type_;
- mc_region_storage_type_t storage_type_;
- mc_object_info_t object_info_;
+ RegionType region_type_;
+ StorageType storage_type_;
+ simgrid::mc::ObjectInformation* object_info_;
/** @brief Virtual address of the region in the simulated process */
void *start_addr_;
* */
void *permanent_addr_;
- std::vector<char> flat_data_;
+ flat_data_ptr flat_data_;
PerPageCopy page_numbers_;
std::vector<RegionSnapshot> privatized_regions_;
public:
RegionSnapshot() :
- region_type_(MC_REGION_TYPE_UNKNOWN),
- storage_type_(MC_REGION_STORAGE_TYPE_NONE),
+ region_type_(UnknownRegion),
+ storage_type_(NoData),
object_info_(nullptr),
start_addr_(nullptr),
size_(0),
permanent_addr_(nullptr)
{}
- RegionSnapshot(mc_region_type_t type, void *start_addr, void* permanent_addr, size_t size) :
+ RegionSnapshot(RegionType type, void *start_addr, void* permanent_addr, size_t size) :
region_type_(type),
- storage_type_(MC_REGION_STORAGE_TYPE_NONE),
+ storage_type_(NoData),
object_info_(nullptr),
start_addr_(start_addr),
size_(size),
void clear()
{
- region_type_ = MC_REGION_TYPE_UNKNOWN;
- storage_type_ = MC_REGION_STORAGE_TYPE_NONE;
+ region_type_ = UnknownRegion;
+ storage_type_ = NoData;
privatized_regions_.clear();
page_numbers_.clear();
- flat_data_.clear();
+ flat_data_.reset();
object_info_ = nullptr;
start_addr_ = nullptr;
size_ = 0;
void clear_data()
{
- storage_type_ = MC_REGION_STORAGE_TYPE_NONE;
- flat_data_.clear();
+ storage_type_ = NoData;
+ flat_data_.reset();
page_numbers_.clear();
privatized_regions_.clear();
}
- void flat_data(std::vector<char> data)
+ void flat_data(flat_data_ptr data)
{
- storage_type_ = MC_REGION_STORAGE_TYPE_FLAT;
+ storage_type_ = FlatData;
flat_data_ = std::move(data);
page_numbers_.clear();
privatized_regions_.clear();
}
- std::vector<char> const& flat_data() const { return flat_data_; }
+ const char* flat_data() const { return flat_data_.get(); }
void page_data(PerPageCopy page_data)
{
- storage_type_ = MC_REGION_STORAGE_TYPE_CHUNKED;
- flat_data_.clear();
+ storage_type_ = ChunkedData;
+ flat_data_.reset();
page_numbers_ = std::move(page_data);
privatized_regions_.clear();
}
void privatized_data(std::vector<RegionSnapshot> data)
{
- storage_type_ = MC_REGION_STORAGE_TYPE_PRIVATIZED;
- flat_data_.clear();
+ storage_type_ = PrivatizedData;
+ flat_data_.reset();
page_numbers_.clear();
privatized_regions_ = std::move(data);
}
return privatized_regions_;
}
- mc_object_info_t object_info() const { return object_info_; }
- void object_info(mc_object_info_t info) { object_info_ = info; }
+ simgrid::mc::ObjectInformation* object_info() const { return object_info_; }
+ void object_info(simgrid::mc::ObjectInformation* info) { object_info_ = info; }
// Other getters
remote_ptr<void> end() const { return remote((char*)start_addr_ + size_); }
remote_ptr<void> permanent_address() const { return remote(permanent_addr_); }
std::size_t size() const { return size_; }
- mc_region_storage_type_t storage_type() const { return storage_type_; }
- mc_region_type_t region_type() const { return region_type_; }
+ StorageType storage_type() const { return storage_type_; }
+ RegionType region_type() const { return region_type_; }
bool contain(remote_ptr<void> p) const
{
}
};
-simgrid::mc::RegionSnapshot privatized_region(
- mc_region_type_t type, void *start_addr, void* data_addr, size_t size);
-simgrid::mc::RegionSnapshot dense_region(
- mc_region_type_t type, void *start_addr, void* data_addr, size_t size);
+RegionSnapshot privatized_region(
+ RegionType type, void *start_addr, void* data_addr, size_t size);
+RegionSnapshot dense_region(
+ RegionType type, void *start_addr, void* data_addr, size_t size);
simgrid::mc::RegionSnapshot sparse_region(
- mc_region_type_t type, void *start_addr, void* data_addr, size_t size);
+ RegionType type, void *start_addr, void* data_addr, size_t size,
+ RegionSnapshot const* ref_region);
simgrid::mc::RegionSnapshot region(
- mc_region_type_t type, void *start_addr, void* data_addr, size_t size);
-
+ RegionType type, void *start_addr, void* data_addr, size_t size,
+ RegionSnapshot const* ref_region);
+
}
}
