#ifndef SIMGRID_MC_SNAPSHOT_H
#define SIMGRID_MC_SNAPSHOT_H
-#include <sys/types.h> // off_t
-#include <stdint.h> // size_t
+#include <cstdint>
+#include <cstddef>
#include <vector>
#include <set>
+#include <string>
#include <memory>
+#include <sys/types.h> // off_t
+
#include <simgrid_config.h>
-#include "../xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
#include <xbt/asserts.h>
-#include <xbt/dynar.h>
#include <xbt/base.h>
-#include "mc_forward.hpp"
-#include "ModelChecker.hpp"
-#include "PageStore.hpp"
-#include "mc_mmalloc.h"
-#include "mc/AddressSpace.hpp"
-#include "mc_unw.h"
-#include "RegionSnapshot.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/ModelChecker.hpp"
+#include "src/mc/PageStore.hpp"
+#include "src/mc/AddressSpace.hpp"
+#include "src/mc/mc_unw.h"
+#include "src/mc/RegionSnapshot.hpp"
SG_BEGIN_DECL()
case simgrid::mc::StorageType::Flat:
{
uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address();
- return (void *) ((uintptr_t) region->flat_data() + offset);
+ return (void *) ((uintptr_t) region->flat_data().get() + offset);
}
case simgrid::mc::StorageType::Chunked:
namespace simgrid {
namespace mc {
-class XBT_PRIVATE Snapshot : public AddressSpace {
+class XBT_PRIVATE Snapshot final : public AddressSpace {
public:
- Snapshot();
+ Snapshot(Process* process);
~Snapshot();
const void* read_bytes(void* buffer, std::size_t size,
- remote_ptr<void> address, int process_index = ProcessIndexAny,
- ReadMode mode = Normal) const override;
+ RemotePtr<void> address, int process_index = ProcessIndexAny,
+ ReadOptions options = ReadOptions::none()) const override;
public: // To be private
- simgrid::mc::Process* process;
int num_state;
- size_t heap_bytes_used;
+ std::size_t heap_bytes_used;
std::vector<std::unique_ptr<s_mc_mem_region_t>> snapshot_regions;
std::set<pid_t> enabled_processes;
int privatization_index;
- std::vector<size_t> stack_sizes;
+ std::vector<std::size_t> stack_sizes;
std::vector<s_mc_snapshot_stack_t> stacks;
- std::vector<s_mc_heap_ignore_region_t> to_ignore;
- uint64_t hash;
+ std::vector<simgrid::mc::IgnoredHeapRegion> to_ignore;
+ std::uint64_t hash;
std::vector<s_mc_snapshot_ignored_data> ignored_data;
std::vector<s_fd_infos_t> current_fds;
};
static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
-XBT_PRIVATE mc_snapshot_t MC_take_snapshot(int num_state);
-XBT_PRIVATE void MC_restore_snapshot(mc_snapshot_t);
+}
+
+#ifdef __cplusplus
+
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE mc_snapshot_t take_snapshot(int num_state);
+XBT_PRIVATE void restore_snapshot(mc_snapshot_t);
+
+}
+}
+
+#endif
+
+extern "C" {
XBT_PRIVATE void mc_restore_page_snapshot_region(
simgrid::mc::Process* process,
- void* start_addr, simgrid::mc::PerPageCopy const& pagenos);
+ void* start_addr, simgrid::mc::ChunkedData const& pagenos);
const void* MC_region_read_fragmented(
- mc_mem_region_t region, void* target, const void* addr, size_t size);
+ mc_mem_region_t region, void* target, const void* addr, std::size_t size);
int MC_snapshot_region_memcmp(
const void* addr1, mc_mem_region_t region1,
- const void* addr2, mc_mem_region_t region2, size_t size);
+ const void* addr2, mc_mem_region_t region2, std::size_t size);
XBT_PRIVATE int MC_snapshot_memcmp(
const void* addr1, mc_snapshot_t snapshot1,
- const void* addr2, mc_snapshot_t snapshot2, int process_index, size_t size);
+ const void* addr2, mc_snapshot_t snapshot2, int process_index, std::size_t size);
static inline __attribute__ ((always_inline))
const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot)
* @return Pointer where the data is located (target buffer of original location)
*/
static inline __attribute__((always_inline))
-const void* MC_region_read(mc_mem_region_t region, void* target, const void* addr, size_t size)
+const void* MC_region_read(
+ mc_mem_region_t region, void* target, const void* addr, std::size_t size)
{
xbt_assert(region);
- uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address();
+ std::uintptr_t offset =
+ (std::uintptr_t) addr - (std::uintptr_t) region->start().address();
xbt_assert(region->contain(simgrid::mc::remote(addr)),
"Trying to read out of the region boundary.");
xbt_die("Storage type not supported");
case simgrid::mc::StorageType::Flat:
- return (char*) region->flat_data() + offset;
+ return (char*) region->flat_data().get() + offset;
case simgrid::mc::StorageType::Chunked:
{
SG_END_DECL()
XBT_PRIVATE int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
- std::vector<s_mc_heap_ignore_region_t>* i1,
- std::vector<s_mc_heap_ignore_region_t>* i2);
+ std::vector<simgrid::mc::IgnoredHeapRegion>* i1,
+ std::vector<simgrid::mc::IgnoredHeapRegion>* i2);
#endif