Add MC support for processes with multiple enabled transitions per state

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

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 88992b9..364584e 100644 (file)
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -16,7 +16,6 @@ void MC_dpor_init()
 {
   mc_state_t initial_state = NULL;
   mc_transition_t trans = NULL;
-  xbt_setset_cursor_t cursor = NULL;
   
   /* Create the initial state and push it into the exploration stack */
   MC_SET_RAW_MEM;
@@ -30,13 +29,8 @@ void MC_dpor_init()
   MC_schedule_enabled_processes();
 
   MC_SET_RAW_MEM;
-  xbt_setset_add(initial_state->enabled_transitions, initial_state->transitions);
-  xbt_setset_foreach(initial_state->enabled_transitions, cursor, trans){
-    if(trans->type == mc_wait
-       && (trans->comm->src_proc == NULL || trans->comm->dst_proc == NULL)){
-      xbt_setset_set_remove(initial_state->enabled_transitions, trans);
-    }
-  }
+  MC_trans_compute_enabled(initial_state->enabled_transitions,
+                           initial_state->transitions);
 
   /* Fill the interleave set of the initial state with an enabled process */
   trans = xbt_setset_set_choose(initial_state->enabled_transitions);  
@@ -44,8 +38,6 @@ void MC_dpor_init()
     xbt_setset_set_insert(initial_state->interleave, trans);
   MC_UNSET_RAW_MEM;
 
-  trans->refcount++;
-
   /* Update Statistics */
   mc_stats->state_size += xbt_setset_set_size(initial_state->enabled_transitions);
 }
@@ -57,8 +49,7 @@ void MC_dpor_init()
  */
 void MC_dpor(void)
 {
-  mc_transition_t trans = NULL;  
-  mc_state_t current_state = NULL;
+  mc_transition_t trans, trans_tmp = NULL;  
   mc_state_t next_state = NULL;
   xbt_setset_cursor_t cursor = NULL;
   
@@ -70,17 +61,17 @@ void MC_dpor(void)
        some actions on the models. (ex. all the processes do a sleep(0) in a round). */
 
     /* Get current state */
-    current_state = (mc_state_t) xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
+    mc_current_state = (mc_state_t) xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack));
    
     /* If there are transitions to execute and the maximun depth has not been reached 
        then perform one step of the exploration algorithm */
-    if(xbt_setset_set_size(current_state->interleave) > 0 && xbt_fifo_size(mc_stack) < MAX_DEPTH){
+    if(xbt_setset_set_size(mc_current_state->interleave) > 0 && xbt_fifo_size(mc_stack) < MAX_DEPTH){
 
       DEBUG4("Exploration detph=%d (state=%p)(%d interleave) (%d enabled)", xbt_fifo_size(mc_stack),
-        current_state, xbt_setset_set_size(current_state->interleave),
-        xbt_setset_set_size(current_state->enabled_transitions));
+        mc_current_state, xbt_setset_set_size(mc_current_state->interleave),
+        xbt_setset_set_size(mc_current_state->enabled_transitions));
 
-      xbt_setset_foreach(current_state->enabled_transitions, cursor, trans){
+      xbt_setset_foreach(mc_current_state->enabled_transitions, cursor, trans){
         DEBUG1("\t %s", trans->name);
       }
       
@@ -92,16 +83,18 @@ void MC_dpor(void)
          state, and create the data structures for the new expanded state in the
          exploration stack. */
       MC_SET_RAW_MEM;
-      trans = xbt_setset_set_extract(current_state->interleave);
+      trans = xbt_setset_set_choose(mc_current_state->interleave);
+      if(trans->type != mc_random){
+        xbt_setset_set_remove(mc_current_state->interleave, trans);
+        /* Add the transition in the done set of the current state */
+        xbt_setset_set_insert(mc_current_state->done, trans);
+      }
+      
       next_state = MC_state_new();
       xbt_fifo_unshift(mc_stack, next_state);
       
-      /* Add the transition in the done set of the current state */
-      xbt_setset_set_insert(current_state->done, trans);
-      trans->refcount++;
-      
       /* Set it as the executed transition of the current state */
-      current_state->executed_transition = trans;
+      mc_current_state->executed_transition = trans;
       MC_UNSET_RAW_MEM;
 
       /* Execute the selected transition by scheduling it's associated process.
@@ -111,27 +104,37 @@ void MC_dpor(void)
       SIMIX_process_schedule(trans->process);
       MC_execute_surf_actions();        /* Do surf's related black magic */
       MC_schedule_enabled_processes();
+
+      if(trans->type == mc_random && trans->random.current_value < trans->random.max){
+        trans->random.current_value++;
+      }else{
+        //trans->random.current_value = trans->random.min;
+        xbt_setset_set_remove(mc_current_state->interleave, trans);
+        xbt_setset_set_insert(mc_current_state->done, trans);
+      }
       
-      /* Calculate the enabled transitions set of the next state:
-          -add the transition sets of the current state and the next state 
-          -remove the executed transition from that set
-          -remove all the transitions that are disabled (mc_wait only)
-          -use the resulting set as the enabled transitions of the next state */
+      /* Calculate the enabled transitions set of the next state */
       MC_SET_RAW_MEM;
-      xbt_setset_add(next_state->transitions, current_state->transitions);
-      xbt_setset_set_remove(next_state->transitions, trans);
-      xbt_setset_add(next_state->enabled_transitions, next_state->transitions);
-      xbt_setset_foreach(next_state->enabled_transitions, cursor, trans){
-        if(trans->type == mc_wait
-           && (trans->comm->src_proc == NULL || trans->comm->dst_proc == NULL)){
-          xbt_setset_set_remove(next_state->enabled_transitions, trans);
+
+      xbt_setset_foreach(mc_current_state->transitions, cursor, trans_tmp){
+        DEBUG1("Checking transition %s", trans_tmp->name);
+        if(trans_tmp->process != trans->process){
+          DEBUG2("Inherit transition %p (%lu)", trans_tmp, trans_tmp->ID);
+          xbt_setset_set_insert(next_state->transitions, trans_tmp);
         }
       }
-
+      
+      MC_trans_compute_enabled(next_state->enabled_transitions, next_state->transitions);
+      
       /* Choose one transition to interleave from the enabled transition set */      
       trans = xbt_setset_set_choose(next_state->enabled_transitions);
-      if(trans)
-        xbt_setset_set_insert(next_state->interleave, trans);
+      if(trans){
+        DEBUG1("Choosing transition %p", trans);
+        xbt_setset_foreach(next_state->enabled_transitions, cursor, trans_tmp){
+          if(trans_tmp->process == trans->process)
+            xbt_setset_set_insert(next_state->interleave, trans_tmp);    
+        }
+      }
       MC_UNSET_RAW_MEM;
 
       /* Update Statistics */
@@ -142,7 +145,26 @@ void MC_dpor(void)
     /* The interleave set is empty or the maximum depth is reached, let's back-track */
     }else{
       DEBUG0("There are no more transitions to interleave.");
-      
+
+  
+      /* Check for deadlocks */
+      xbt_setset_substract(mc_current_state->transitions, mc_current_state->done);
+      if(xbt_setset_set_size(mc_current_state->transitions) > 0){
+        INFO0("**************************");
+        INFO0("*** DEAD-LOCK DETECTED ***");
+        INFO0("**************************");
+        INFO0("Locked transitions:");
+        xbt_setset_foreach(mc_current_state->transitions, cursor, trans){
+          INFO1("%s", trans->name);
+        }
+
+        INFO0("Counter-example execution trace:");
+        MC_dump_stack(mc_stack);
+        
+        MC_print_statistics(mc_stats);
+        xbt_abort();
+      }
+              
       mc_transition_t q = NULL;
       xbt_fifo_item_t item = NULL;
       mc_state_t state = NULL;
@@ -152,7 +174,7 @@ void MC_dpor(void)
       /* Trash the current state, no longer needed */
       MC_SET_RAW_MEM;
       xbt_fifo_shift(mc_stack);
-      MC_state_delete(current_state);
+      MC_state_delete(mc_current_state);
       
       /* Traverse the stack backwards until a state with a non empty interleave
          set is found, deleting all the states that have it empty in the way.
@@ -160,15 +182,21 @@ void MC_dpor(void)
          (from it's predecesor state), depends on any other previous transition 
          executed before it. If it does then add it to the interleave set of the
          state that executed that previous transition. */
-      while((current_state = xbt_fifo_shift(mc_stack)) != NULL){
-        q = current_state->executed_transition;
+      while((mc_current_state = xbt_fifo_shift(mc_stack)) != NULL){
+        q = mc_current_state->executed_transition;
         xbt_fifo_foreach(mc_stack, item, state, mc_state_t){
           if(MC_transition_depend(q, state->executed_transition)){
-            DEBUG3("Dependence found at state %p (%p,%p)", state, state->executed_transition, q);
+            DEBUG3("Dependence found at state %p (%p,%p)", state, state->executed_transition, q); 
             xbt_setset_foreach(state->enabled_transitions, cursor, trans){
               if((trans->process == q->process) && !xbt_setset_set_belongs(state->done, trans)){
                 DEBUG2("Unexplored interleaving found at state %p (%p)", state, trans);
-                xbt_setset_set_insert(state->interleave, trans);
+
+                xbt_setset_foreach(state->enabled_transitions, cursor, trans){
+                  if(trans->process == q->process)
+                    xbt_setset_set_insert(state->interleave, trans);    
+                }
+                /* FIXME: hack to make it work*/
+                trans = q;
                 break;
               }
             }
@@ -176,15 +204,15 @@ void MC_dpor(void)
               break;
           }
         }
-        if(xbt_setset_set_size(current_state->interleave) > 0){
+        if(xbt_setset_set_size(mc_current_state->interleave) > 0){
           /* We found a back-tracking point, let's loop */
-          xbt_fifo_unshift(mc_stack, current_state);
+          xbt_fifo_unshift(mc_stack, mc_current_state);
           DEBUG1("Back-tracking to depth %d", xbt_fifo_size(mc_stack));
           MC_replay(mc_stack);
           MC_UNSET_RAW_MEM;
           break;
         }else{
-          MC_state_delete(current_state);
+          MC_state_delete(mc_current_state);
         }        
       }
     }