[mc] Fix broken mc_snapshot_get_heap_end()

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

diff --git a/src/mc/mc_snapshot.h b/src/mc/mc_snapshot.h
index 3daae1b..7591a31 100644 (file)
--- a/src/mc/mc_snapshot.h
+++ b/src/mc/mc_snapshot.h
@@ -20,6 +20,7 @@
 #include "mc_page_store.h"
 #include "mc_mmalloc.h"
 #include "mc_address_space.h"
+#include "mc_unw.h"
 
 SG_BEGIN_DECL()
 
@@ -199,6 +200,7 @@ typedef struct s_fd_infos{
 
 struct s_mc_snapshot {
   mc_process_t process;
+  int num_state;
   s_mc_address_space_t address_space;
   size_t heap_bytes_used;
   mc_mem_region_t* snapshot_regions;
@@ -239,7 +241,7 @@ typedef struct s_mc_stack_frame {
 
 typedef struct s_mc_snapshot_stack{
   xbt_dynar_t local_variables;
-  unw_context_t context;
+  mc_unw_context_t context;
   xbt_dynar_t stack_frames; // mc_stack_frame_t
   int process_index;
 }s_mc_snapshot_stack_t, *mc_snapshot_stack_t;
@@ -250,8 +252,10 @@ typedef struct s_mc_global_t {
   int prev_pair;
   char *prev_req;
   int initial_communications_pattern_done;
-  int comm_deterministic;
+  int recv_deterministic;
   int send_deterministic;
+  char *send_diff;
+  char *recv_diff;
 }s_mc_global_t, *mc_global_t;
 
 typedef struct s_mc_checkpoint_ignore_region{
@@ -299,10 +303,7 @@ const void* mc_snapshot_get_heap_end(mc_snapshot_t snapshot)
 {
   if(snapshot==NULL)
       xbt_die("snapshot is NULL");
-  // This is &std_heap->breakval in the target process:
-  void** addr = &MC_process_get_heap(&mc_model_checker->process)->breakval;
-  // Read (std_heap->breakval) in the target process (*addr i.e. std_heap->breakval):
-  return MC_snapshot_read_pointer(snapshot, addr, MC_PROCESS_INDEX_ANY);
+  return MC_process_get_heap(&mc_model_checker->process)->breakval;
 }
 
 /** @brief Read memory from a snapshot region