#include <vector>
#include <set>
+#include <memory>
#include <simgrid_config.h>
#include "../xbt/mmalloc/mmprivate.h"
unw_word_t sp;
unw_word_t frame_base;
dw_frame_t frame;
- char* frame_name;
+ 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;
+ unsigned long ip;
+ std::string name;
+ dw_type_t type;
+ void *address;
+ int region;
+} s_local_variable_t, *local_variable_t;
+
typedef struct s_mc_snapshot_stack{
- xbt_dynar_t local_variables;
+ std::vector<s_local_variable> local_variables;
mc_unw_context_t context;
- xbt_dynar_t stack_frames; // mc_stack_frame_t
+ std::vector<s_mc_stack_frame_t> stack_frames;
int process_index;
+
+ s_mc_snapshot_stack()
+ : context(nullptr), process_index(0)
+ {}
+ ~s_mc_snapshot_stack();
+ s_mc_snapshot_stack(s_mc_snapshot_stack& p) = delete;
+ s_mc_snapshot_stack& operator=(s_mc_snapshot_stack&) = delete;
+
+ s_mc_snapshot_stack(s_mc_snapshot_stack&& that)
+ {
+ *this = std::move(that);
+ }
+ s_mc_snapshot_stack& operator=(s_mc_snapshot_stack&& that)
+ {
+ this->local_variables = std::move(that.local_variables);
+ this->context = std::move(that.context);
+ that.context = nullptr;
+ this->process_index = that.process_index;
+ that.process_index = 0;
+ return *this;
+ }
+
}s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
typedef struct s_mc_global_t {
mc_process_t process;
int num_state;
size_t heap_bytes_used;
- mc_mem_region_t* snapshot_regions;
- size_t snapshot_regions_count;
+ 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;