-/* 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 <xbt/asserts.h>
#include <xbt/dynar.h>
-#include "mc_forward.h"
+#include "mc_forward.hpp"
#include "ModelChecker.hpp"
#include "PageStore.hpp"
#include "mc_mmalloc.h"
// ***** Snapshot region
-XBT_INTERNAL void mc_region_restore_sparse(mc_process_t process, mc_mem_region_t reg);
+XBT_INTERNAL 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)
}
XBT_INTERNAL mc_mem_region_t mc_get_snapshot_region(
- const void* addr, const s_mc_snapshot_t *snapshot, int process_index);
+ const void* addr, const simgrid::mc::Snapshot *snapshot, int process_index);
}
/** 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_local_variable{
- dw_frame_t subprogram;
+ simgrid::mc::Frame* subprogram;
unsigned long ip;
std::string name;
- dw_type_t type;
+ simgrid::mc::Type* type;
void *address;
int region;
} s_local_variable_t, *local_variable_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_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;
~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;
+ ReadMode mode = Normal) const override;
public: // To be private
- mc_process_t process;
+ simgrid::mc::Process* process;
int num_state;
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;
+ std::vector<s_mc_snapshot_stack_t> stacks;
std::vector<s_mc_heap_ignore_region_t> to_ignore;
uint64_t hash;
std::vector<s_mc_snapshot_ignored_data> ignored_data;
XBT_INTERNAL void MC_restore_snapshot(mc_snapshot_t);
XBT_INTERNAL void mc_restore_page_snapshot_region(
- mc_process_t process,
+ simgrid::mc::Process* process,
void* start_addr, simgrid::mc::PerPageCopy const& pagenos);
MC_SHOULD_BE_INTERNAL const void* MC_region_read_fragmented(