[mc] Make s_mc_snapshot_stack::context not a pointer

[simgrid.git] / src / mc / mc_snapshot.h

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 0bb55bc..8d9ce91 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -12,6 +12,7 @@
 
 #include <vector>
 #include <set>
+#include <memory>
 
 #include <simgrid_config.h>
 #include "../xbt/mmalloc/mmprivate.h"
@@ -104,16 +105,25 @@ typedef struct s_mc_stack_frame {
   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_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{
+  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 {
+  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;
@@ -140,13 +150,12 @@ 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::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;
+  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;
   std::vector<s_fd_infos_t> current_fds;
@@ -248,4 +257,8 @@ void* MC_region_read_pointer(mc_mem_region_t region, const void* addr)
 
 SG_END_DECL()
 
+XBT_INTERNAL 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);
+
 #endif