Merge branch 'master' into MC_LTL

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

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 9378ddd..3d5b514 100644 (file)
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -20,7 +20,7 @@ void MC_dpor_init()
   /* Create the initial state and push it into the exploration stack */
   MC_SET_RAW_MEM;
   initial_state = MC_state_new();
-  xbt_fifo_unshift(mc_stack, initial_state);
+  xbt_fifo_unshift(mc_stack_safety_stateless, initial_state);
   MC_UNSET_RAW_MEM;
 
   XBT_DEBUG("**************************************************");
@@ -58,15 +58,15 @@ void MC_dpor(void)
   smx_process_t process = NULL;
   xbt_fifo_item_t item = NULL;
 
-  while (xbt_fifo_size(mc_stack) > 0) {
+  while (xbt_fifo_size(mc_stack_safety_stateless) > 0) {
 
     /* Get current state */
     state = (mc_state_t) 
-      xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
+      xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_safety_stateless));
 
     XBT_DEBUG("**************************************************");
     XBT_DEBUG("Exploration depth=%d (state=%p)(%u interleave)",
-           xbt_fifo_size(mc_stack), state,
+           xbt_fifo_size(mc_stack_safety_stateless), state,
            MC_state_interleave_size(state));
 
     /* Update statistics */
@@ -74,7 +74,7 @@ void MC_dpor(void)
 
     /* If there are processes to interleave and the maximum depth has not been reached
        then perform one step of the exploration algorithm */
-    if (xbt_fifo_size(mc_stack) < MAX_DEPTH &&
+    if (xbt_fifo_size(mc_stack_safety_stateless) < MAX_DEPTH &&
         (req = MC_state_get_request(state, &value))) {
 
       /* Debug information */
@@ -96,7 +96,7 @@ void MC_dpor(void)
       /* Create the new expanded state */
       MC_SET_RAW_MEM;
       next_state = MC_state_new();
-      xbt_fifo_unshift(mc_stack, next_state);
+      xbt_fifo_unshift(mc_stack_safety_stateless, next_state);
 
       /* Get an enabled process and insert it in the interleave set of the next state */
       xbt_swag_foreach(process, simix_global->process_list){
@@ -119,7 +119,7 @@ void MC_dpor(void)
 
       /* Trash the current state, no longer needed */
       MC_SET_RAW_MEM;
-      xbt_fifo_shift(mc_stack);
+      xbt_fifo_shift(mc_stack_safety_stateless);
       MC_state_delete(state);
       MC_UNSET_RAW_MEM;
 
@@ -136,9 +136,9 @@ void MC_dpor(void)
          (from it's predecesor state), depends on any other previous request 
          executed before it. If it does then add it to the interleave set of the
          state that executed that previous request. */
-      while ((state = xbt_fifo_shift(mc_stack)) != NULL) {
+      while ((state = xbt_fifo_shift(mc_stack_safety_stateless)) != NULL) {
         req = MC_state_get_internal_request(state);
-        xbt_fifo_foreach(mc_stack, item, prev_state, mc_state_t) {
+        xbt_fifo_foreach(mc_stack_safety_stateless, item, prev_state, mc_state_t) {
           if(MC_request_depend(req, MC_state_get_internal_request(prev_state))){
             if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
               XBT_DEBUG("Dependent Transitions:");
@@ -162,10 +162,10 @@ void MC_dpor(void)
         }
         if (MC_state_interleave_size(state)) {
           /* We found a back-tracking point, let's loop */
-          xbt_fifo_unshift(mc_stack, state);
-          XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack));
+          xbt_fifo_unshift(mc_stack_safety_stateless, state);
+          XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety_stateless));
           MC_UNSET_RAW_MEM;
-          MC_replay(mc_stack);
+          MC_replay(mc_stack_safety_stateless);
           break;
         } else {
           MC_state_delete(state);
@@ -179,7 +179,7 @@ void MC_dpor(void)
 }
 
 
-/********************* DPOR without replay *********************/
+/********************* DPOR stateful *********************/
 
 mc_state_ws_t new_state_ws(mc_snapshot_t s, mc_state_t gs){
   mc_state_ws_t sws = NULL;
@@ -189,10 +189,10 @@ mc_state_ws_t new_state_ws(mc_snapshot_t s, mc_state_t gs){
   return sws;
 }
 
-void MC_dpor_with_restore_snapshot_init(){
+void MC_dpor_stateful_init(){
 
   XBT_DEBUG("**************************************************");
-  XBT_DEBUG("DPOR (with restore snapshot) init");
+  XBT_DEBUG("DPOR (stateful) init");
   XBT_DEBUG("**************************************************");
 
   mc_state_t initial_graph_state;
@@ -217,19 +217,17 @@ void MC_dpor_with_restore_snapshot_init(){
   MC_take_snapshot(initial_system_snapshot);
 
   initial_state = new_state_ws(initial_system_snapshot, initial_graph_state);
-  xbt_fifo_unshift(mc_snapshot_stack, initial_state);
+  xbt_fifo_unshift(mc_stack_safety_stateful, initial_state);
 
   MC_UNSET_RAW_MEM;
-         
-  MC_dpor_with_restore_snapshot();
 
 }
 
-void MC_dpor_with_restore_snapshot(){
+void MC_dpor_stateful(){
 
   smx_process_t process = NULL;
   
-  if(xbt_fifo_size(mc_snapshot_stack) == 0)
+  if(xbt_fifo_size(mc_stack_safety_stateful) == 0)
     return;
 
   int value;
@@ -243,26 +241,32 @@ void MC_dpor_with_restore_snapshot(){
   mc_state_ws_t prev_state;
   mc_state_ws_t next_state;
  
-  while(xbt_fifo_size(mc_snapshot_stack) > 0){
+  while(xbt_fifo_size(mc_stack_safety_stateful) > 0){
 
-    current_state = (mc_state_ws_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_snapshot_stack));
+    current_state = (mc_state_ws_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_safety_stateful));
 
     
     XBT_DEBUG("**************************************************");
-    XBT_DEBUG("Depth : %d, State : %p , %u interleave", xbt_fifo_size(mc_snapshot_stack),current_state, MC_state_interleave_size(current_state->graph_state));
-    
+    XBT_DEBUG("Depth : %d, State : %p , %u interleave", xbt_fifo_size(mc_stack_safety_stateful),current_state, MC_state_interleave_size(current_state->graph_state));
+
+    mc_stats->visited_states++;
+    if(mc_stats->expanded_states>1100)
+      exit(0);
+    //sleep(1);
 
-    if((xbt_fifo_size(mc_snapshot_stack) < MAX_DEPTH) && (req = MC_state_get_request(current_state->graph_state, &value))){
+    if((xbt_fifo_size(mc_stack_safety_stateful) < MAX_DEPTH) && (req = MC_state_get_request(current_state->graph_state, &value))){
 
       /* Debug information */
       if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
        req_str = MC_request_to_string(req, value);
-       XBT_DEBUG("Execute: %s", req_str);
+       //XBT_INFO("Visited states = %lu",mc_stats->visited_states );
+       XBT_DEBUG("Execute: %s",req_str);
        xbt_free(req_str);
       }
 
       MC_state_set_executed_request(current_state->graph_state, req, value);
-
+      mc_stats->executed_transitions++;
+      
       /* Answer the request */
       SIMIX_request_pre(req, value);
       
@@ -286,7 +290,7 @@ void MC_dpor_with_restore_snapshot(){
       MC_take_snapshot(next_snapshot);
 
       next_state = new_state_ws(next_snapshot, next_graph_state);
-      xbt_fifo_unshift(mc_snapshot_stack, next_state);
+      xbt_fifo_unshift(mc_stack_safety_stateful, next_state);
       
       MC_UNSET_RAW_MEM;
 
@@ -295,12 +299,19 @@ void MC_dpor_with_restore_snapshot(){
       
       /* Trash the current state, no longer needed */
       MC_SET_RAW_MEM;
-      xbt_fifo_shift(mc_snapshot_stack);
+      xbt_fifo_shift(mc_stack_safety_stateful);
       MC_UNSET_RAW_MEM;
 
-      while((current_state = xbt_fifo_shift(mc_snapshot_stack)) != NULL){
+      /* Check for deadlocks */
+      if(MC_deadlock_check()){
+        MC_show_deadlock_stateful(NULL);
+        return;
+      }
+
+      MC_SET_RAW_MEM;
+      while((current_state = xbt_fifo_shift(mc_stack_safety_stateful)) != NULL){
        req = MC_state_get_internal_request(current_state->graph_state);
-       xbt_fifo_foreach(mc_snapshot_stack, item, prev_state, mc_state_ws_t) {
+       xbt_fifo_foreach(mc_stack_safety_stateful, item, prev_state, mc_state_ws_t) {
           if(MC_request_depend(req, MC_state_get_internal_request(prev_state->graph_state))){
             if(XBT_LOG_ISENABLED(mc_dpor, xbt_log_priority_debug)){
               XBT_DEBUG("Dependent Transitions:");
@@ -327,8 +338,8 @@ void MC_dpor_with_restore_snapshot(){
 
        if(MC_state_interleave_size(current_state->graph_state)){
          MC_restore_snapshot(current_state->system_state);
-         xbt_fifo_unshift(mc_snapshot_stack, current_state);
-         XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_snapshot_stack));
+         xbt_fifo_unshift(mc_stack_safety_stateful, current_state);
+         XBT_DEBUG("Back-tracking to depth %d", xbt_fifo_size(mc_stack_safety_stateful));
          MC_UNSET_RAW_MEM;
          break;
        }
@@ -342,3 +353,5 @@ void MC_dpor_with_restore_snapshot(){
   return;
 }
 
+
+