#include <memory>
#include <vector>
-#include <xbt/base.h>
+#include "xbt/base.h"
-#include "src/mc/remote_ptr.hpp"
-#include "src/mc/PageStore.hpp"
#include "src/mc/AddressSpace.hpp"
#include "src/mc/ChunkedData.hpp"
+#include "src/mc/PageStore.hpp"
+#include "src/mc/remote/RemotePtr.hpp"
namespace simgrid {
namespace mc {
Data = 2
};
-// TODO, use Boost.Variant instead of this
enum class StorageType {
NoData = 0,
Flat = 1,
};
class Buffer {
-public:
+private:
enum class Type {
Malloc,
Mmap
};
-private:
void* data_ = nullptr;
std::size_t size_;
Type type_ = Type::Malloc;
-public:
- Buffer() {}
+private:
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) {}
+public:
+ Buffer() = default;
void clear() noexcept;
~Buffer() noexcept { clear(); }
+ static Buffer malloc(std::size_t size)
+ {
+ return Buffer(size, Type::Malloc);
+ }
+ static Buffer mmap(std::size_t size)
+ {
+ return Buffer(size, Type::Mmap);
+ }
+
// No copy
Buffer(Buffer const& buffer) = delete;
Buffer& operator=(Buffer const& buffer) = delete;
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
*
* * privatized (SMPI global variable privatisation).
*
- * This is handled with a variant based approch:
+ * This is handled with a variant based approach:
*
* * `storage_type` identified the type of storage;
*
size_(size),
permanent_addr_(permanent_addr)
{}
- ~RegionSnapshot() {}
+ ~RegionSnapshot() = default;
RegionSnapshot(RegionSnapshot const&) = default;
RegionSnapshot& operator=(RegionSnapshot const&) = default;
RegionSnapshot(RegionSnapshot&& that)
// Other getters
- remote_ptr<void> start() const { return remote(start_addr_); }
- remote_ptr<void> end() const { return remote((char*)start_addr_ + size_); }
- remote_ptr<void> permanent_address() const { return remote(permanent_addr_); }
+ 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(remote_ptr<void> p) const
+ bool contain(RemotePtr<void> p) const
{
return p >= start() && p < end();
}
RegionSnapshot privatized_region(
RegionType region_type, void *start_addr, void* permanent_addr,
- std::size_t size, const RegionSnapshot* ref_region);
+ 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,
- RegionSnapshot const* ref_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 const* ref_region);
+ RegionType type, void *start_addr, void* data_addr, std::size_t size);
}
}
-typedef class simgrid::mc::RegionSnapshot s_mc_mem_region_t, *mc_mem_region_t;
-
+typedef class simgrid::mc::RegionSnapshot s_mc_mem_region_t;
+typedef s_mc_mem_region_t* mc_mem_region_t;
#endif