-/* Copyright (c) 2007-2014. The SimGrid Team.
+/* Copyright (c) 2007-2015. 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 MC_SNAPSHOT_H
-#define MC_SNAPSHOT_H
+#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.h"
-#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()
// ***** Snapshot region
-XBT_INTERNAL void mc_region_restore_sparse(mc_process_t process, mc_mem_region_t reg);
+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)
case simgrid::mc::StorageType::Flat:
{
uintptr_t offset = (uintptr_t) addr - (uintptr_t) region->start().address();
- return (void *) ((uintptr_t) region->flat_data().data() + offset);
+ return (void *) ((uintptr_t) region->flat_data().get() + offset);
}
case simgrid::mc::StorageType::Chunked:
}
}
-XBT_INTERNAL mc_mem_region_t mc_get_snapshot_region(
- const void* addr, const s_mc_snapshot_t *snapshot, int process_index);
+XBT_PRIVATE mc_mem_region_t mc_get_snapshot_region(
+ const void* addr, const simgrid::mc::Snapshot *snapshot, int process_index);
}
* */
typedef struct s_mc_snapshot_ignored_data {
void* start;
- size_t size;
- void* data;
+ std::vector<char> data;
} s_mc_snapshot_ignored_data_t, *mc_snapshot_ignored_data_t;
typedef struct s_fd_infos{
/** Stack pointer */
unw_word_t sp;
unw_word_t frame_base;
- dw_frame_t frame;
- char* frame_name;
+ simgrid::mc::Frame* frame;
+ std::string frame_name;
unw_cursor_t unw_cursor;
} s_mc_stack_frame_t, *mc_stack_frame_t;
-typedef struct s_mc_snapshot_stack{
- xbt_dynar_t local_variables;
- mc_unw_context_t context;
- xbt_dynar_t stack_frames; // mc_stack_frame_t
+typedef struct s_local_variable{
+ simgrid::mc::Frame* subprogram;
+ unsigned long ip;
+ std::string name;
+ simgrid::mc::Type* type;
+ void *address;
+ int region;
+} s_local_variable_t, *local_variable_t;
+
+typedef struct XBT_PRIVATE s_mc_snapshot_stack {
+ std::vector<s_local_variable> local_variables;
+ s_mc_unw_context_t context;
+ std::vector<s_mc_stack_frame_t> stack_frames;
int process_index;
-}s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
+} s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
typedef struct s_mc_global_t {
mc_snapshot_t snapshot;
namespace simgrid {
namespace mc {
-class 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 MC_OVERRIDE;
+ RemotePtr<void> address, int process_index = ProcessIndexAny,
+ ReadOptions options = ReadOptions::none()) const override;
public: // To be private
- mc_process_t process;
int num_state;
- size_t heap_bytes_used;
- mc_mem_region_t* snapshot_regions;
- size_t snapshot_regions_count;
+ 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;
- xbt_dynar_t stacks;
- xbt_dynar_t to_ignore;
- uint64_t hash;
- xbt_dynar_t ignored_data;
+ std::vector<std::size_t> stack_sizes;
+ std::vector<s_mc_snapshot_stack_t> stacks;
+ 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_INTERNAL mc_snapshot_t MC_take_snapshot(int num_state);
-XBT_INTERNAL void MC_restore_snapshot(mc_snapshot_t);
+}
-XBT_INTERNAL void mc_restore_page_snapshot_region(
- mc_process_t process,
- void* start_addr, simgrid::mc::PerPageCopy const& pagenos);
+#ifdef __cplusplus
-MC_SHOULD_BE_INTERNAL const void* MC_region_read_fragmented(
- mc_mem_region_t region, void* target, const void* addr, size_t size);
+namespace simgrid {
+namespace mc {
+
+XBT_PRIVATE mc_snapshot_t take_snapshot(int num_state);
+XBT_PRIVATE void restore_snapshot(mc_snapshot_t);
-MC_SHOULD_BE_INTERNAL int MC_snapshot_region_memcmp(
+}
+}
+
+#endif
+
+extern "C" {
+
+XBT_PRIVATE void mc_restore_page_snapshot_region(
+ simgrid::mc::Process* process,
+ void* start_addr, simgrid::mc::ChunkedData const& pagenos);
+
+const void* MC_region_read_fragmented(
+ 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);
-XBT_INTERNAL int MC_snapshot_memcmp(
+ 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().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<simgrid::mc::IgnoredHeapRegion>* i1,
+ std::vector<simgrid::mc::IgnoredHeapRegion>* i2);
+
#endif
