-/* Copyright (c) 2007-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */
/* 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_SNAPSHOT_H
#define SIMGRID_MC_SNAPSHOT_H
-#include <sys/types.h> // off_t
-#include <stdint.h> // size_t
-
#include <vector>
#include <set>
+#include <string>
#include <memory>
-#include <simgrid_config.h>
-#include "src/xbt/mmalloc/mmprivate.h"
-#include <xbt/asserts.h>
-#include <xbt/dynar.h>
-#include <xbt/base.h>
-
-#include "src/mc/mc_forward.hpp"
#include "src/mc/ModelChecker.hpp"
-#include "src/mc/PageStore.hpp"
-#include "src/mc/mc_mmalloc.h"
-#include "src/mc/AddressSpace.hpp"
-#include "src/mc/mc_unw.h"
#include "src/mc/RegionSnapshot.hpp"
+#include "src/mc/mc_forward.hpp"
+#include "src/mc/mc_unw.h"
SG_BEGIN_DECL()
XBT_PRIVATE void mc_region_restore_sparse(simgrid::mc::Process* process, mc_mem_region_t reg);
-static inline __attribute__((always_inline))
-void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region)
+static XBT_ALWAYS_INLINE void* mc_translate_address_region_chunked(uintptr_t addr, mc_mem_region_t region)
{
- size_t pageno = mc_page_number((void*)region->start().address(), (void*) addr);
- const void* snapshot_page =
- region->page_data().page(pageno);
- return (char*) snapshot_page + mc_page_offset((void*) addr);
+ auto split = simgrid::mc::mmu::split(addr - region->start().address());
+ auto pageno = split.first;
+ auto offset = split.second;
+ const void* snapshot_page = region->page_data().page(pageno);
+ return (char*) snapshot_page + offset;
}
-static inline __attribute__((always_inline))
-void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index)
+static XBT_ALWAYS_INLINE void* mc_translate_address_region(uintptr_t addr, mc_mem_region_t region, int process_index)
{
switch (region->storage_type()) {
case simgrid::mc::StorageType::NoData:
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:
typedef struct XBT_PRIVATE s_mc_snapshot_stack {
std::vector<s_local_variable> local_variables;
- s_mc_unw_context_t context;
+ simgrid::mc::UnwindContext context;
std::vector<s_mc_stack_frame_t> stack_frames;
int process_index;
} s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
-typedef struct s_mc_global_t {
- mc_snapshot_t snapshot;
- int prev_pair;
- char *prev_req;
- int initial_communications_pattern_done;
- int recv_deterministic;
- int send_deterministic;
- char *send_diff;
- char *recv_diff;
-}s_mc_global_t, *mc_global_t;
-
namespace simgrid {
namespace mc {
class XBT_PRIVATE Snapshot final : public AddressSpace {
public:
- Snapshot(Process* process);
- ~Snapshot();
+ Snapshot(Process* process, int num_state);
+ ~Snapshot() = default;
const void* read_bytes(void* buffer, std::size_t size,
- remote_ptr<void> address, int process_index = ProcessIndexAny,
+ RemotePtr<void> address, int process_index = ProcessIndexAny,
ReadOptions options = ReadOptions::none()) const override;
public: // To be private
int num_state;
extern "C" {
-static inline __attribute__ ((always_inline))
-mc_mem_region_t mc_get_region_hinted(void* addr, mc_snapshot_t snapshot, int process_index, mc_mem_region_t region)
+static XBT_ALWAYS_INLINE mc_mem_region_t mc_get_region_hinted(void* addr, simgrid::mc::Snapshot* snapshot,
+ int process_index, mc_mem_region_t region)
{
if (region->contain(simgrid::mc::remote(addr)))
return region;
return mc_get_snapshot_region(addr, snapshot, process_index);
}
-static const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot);
+static const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot);
}
namespace simgrid {
namespace mc {
-XBT_PRIVATE mc_snapshot_t take_snapshot(int num_state);
-XBT_PRIVATE void restore_snapshot(mc_snapshot_t);
+XBT_PRIVATE std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state);
+XBT_PRIVATE void restore_snapshot(std::shared_ptr<simgrid::mc::Snapshot> snapshot);
}
}
const void* addr1, mc_mem_region_t region1,
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, std::size_t size);
+ const void* addr1, simgrid::mc::Snapshot* snapshot1,
+ const void* addr2, simgrid::mc::Snapshot* snapshot2, int process_index, std::size_t size);
-static inline __attribute__ ((always_inline))
-const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot)
+static XBT_ALWAYS_INLINE const void* mc_snapshot_get_heap_end(simgrid::mc::Snapshot* snapshot)
{
- if(snapshot==NULL)
- xbt_die("snapshot is NULL");
+ if(snapshot==nullptr)
+ xbt_die("snapshot is nullptr");
return mc_model_checker->process().get_heap()->breakval;
}
* @param size Size of the data to read in bytes
* @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, std::size_t size)
+static XBT_ALWAYS_INLINE const void* MC_region_read(mc_mem_region_t region, void* target, const void* addr,
+ std::size_t size)
{
xbt_assert(region);
- std::uintptr_t offset =
- (std::uintptr_t) addr - (std::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_assert(region->contain(simgrid::mc::remote(addr)), "Trying to read out of the region boundary.");
switch (region->storage_type()) {
case simgrid::mc::StorageType::NoData:
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:
{
// Last byte of the region:
void* end = (char*) addr + size - 1;
- if (mc_same_page(addr, end) ) {
+ if (simgrid::mc::mmu::sameChunk((std::uintptr_t) addr, (std::uintptr_t) end) ) {
// The memory is contained in a single page:
return mc_translate_address_region_chunked((uintptr_t) addr, region);
} else {
}
}
-static inline __attribute__ ((always_inline))
-void* MC_region_read_pointer(mc_mem_region_t region, const void* addr)
+static XBT_ALWAYS_INLINE void* MC_region_read_pointer(mc_mem_region_t region, const void* addr)
{
void* res;
return *(void**) MC_region_read(region, &res, addr, sizeof(void*));
SG_END_DECL()
-XBT_PRIVATE int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2,
- std::vector<simgrid::mc::IgnoredHeapRegion>* i1,
- std::vector<simgrid::mc::IgnoredHeapRegion>* i2);
-
#endif
