model-checker : check current_heap before SET_RAW_MEM and restore it after UNSET_RAW_MEM

[simgrid.git] / src / mc / mc_dpor.c

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 6443295..ac40618 100644 (file)
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -13,6 +13,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
  */
 void MC_dpor_init()
 {
+  
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   mc_state_t initial_state = NULL;
   smx_process_t process;
   
@@ -42,6 +45,12 @@ void MC_dpor_init()
   xbt_fifo_unshift(mc_stack_safety, initial_state);
 
   MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
     
   /* FIXME: Update Statistics 
      mc_stats->state_size +=
@@ -55,13 +64,16 @@ void MC_dpor_init()
  */
 void MC_dpor(void)
 {
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   char *req_str;
   int value;
   smx_simcall_t req = NULL, prev_req = NULL;
   mc_state_t state = NULL, prev_state = NULL, next_state = NULL, restore_state=NULL;
   smx_process_t process = NULL;
   xbt_fifo_item_t item = NULL;
-  int pos, i = 1;
+  int pos;
 
   while (xbt_fifo_size(mc_stack_safety) > 0) {
 
@@ -111,7 +123,7 @@ void MC_dpor(void)
         }
       }
 
-      if(_surf_do_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf_do_mc_checkpoint == 0)){
+      if(_surf_mc_checkpoint && ((xbt_fifo_size(mc_stack_safety) + 1) % _surf_mc_checkpoint == 0)){
         next_state->system_state = xbt_new0(s_mc_snapshot_t, 1);
         MC_take_snapshot(next_state->system_state);
       }
@@ -174,7 +186,7 @@ void MC_dpor(void)
         }
         if (MC_state_interleave_size(state)) {
           /* We found a back-tracking point, let's loop */
-          if(_surf_do_mc_checkpoint){
+          if(_surf_mc_checkpoint){
             if(state->system_state != NULL){
               MC_restore_snapshot(state->system_state);
               xbt_fifo_unshift(mc_stack_safety, state);
@@ -182,19 +194,19 @@ void MC_dpor(void)
               MC_UNSET_RAW_MEM;
             }else{
               pos = xbt_fifo_size(mc_stack_safety);
-              item = xbt_fifo_get_last_item(mc_stack_safety);
+              item = xbt_fifo_get_first_item(mc_stack_safety);
               while(pos>0){
                 restore_state = (mc_state_t) xbt_fifo_get_item_content(item);
                 if(restore_state->system_state != NULL){
                   break;
                 }else{
-                  item = xbt_fifo_get_prev_item(item);
+                  item = xbt_fifo_get_next_item(item);
                   pos--;
                 }
               }
               MC_restore_snapshot(restore_state->system_state);
               xbt_fifo_unshift(mc_stack_safety, state);
-              XBT_DEBUG("Back-tracking to depth %d", pos);
+              XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
               MC_UNSET_RAW_MEM;
               MC_replay(mc_stack_safety, pos);
             }
@@ -202,7 +214,7 @@ void MC_dpor(void)
             xbt_fifo_unshift(mc_stack_safety, state);
             XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety));
             MC_UNSET_RAW_MEM;
-            MC_replay(mc_stack_safety, 1);
+            MC_replay(mc_stack_safety, -1);
           }
           break;
         } else {
@@ -214,6 +226,13 @@ void MC_dpor(void)
   }
   MC_print_statistics(mc_stats);
   MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
+
   return;
 }