model-checker : separate informations for safety stateful/stateless and liveness...

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

diff --git a/src/mc/mc_state.c b/src/mc/mc_state.c
index 46f6d6c..08d7b59 100644 (file)
--- a/src/mc/mc_state.c
+++ b/src/mc/mc_state.c
@@ -1,3 +1,5 @@
+
+
 #include "../simix/private.h"
 #include "xbt/fifo.h"
 #include "private.h"
@@ -17,6 +19,18 @@ mc_state_t MC_state_new(void)
   return state;
 }
 
+mc_state_t MC_state_pair_new(void)
+{
+  mc_state_t state = NULL;
+  
+  state = xbt_new0(s_mc_state_t, 1);
+  state->max_pid = simix_process_maxpid;
+  state->proc_status = xbt_new0(s_mc_procstate_t, state->max_pid);
+  
+  //mc_stats->expanded_states++;
+  return state;
+}
+
 /**
  * \brief Deletes a state data structure
  * \param trans The state to be deleted
@@ -112,7 +126,7 @@ smx_req_t MC_state_get_request(mc_state_t state, int *value)
 {
   smx_process_t process = NULL;
   mc_procstate_t procstate = NULL;
-
+  unsigned int start_count;
 
   xbt_swag_foreach(process, simix_global->process_list){
     procstate = &state->proc_status[process->pid];
@@ -138,12 +152,8 @@ smx_req_t MC_state_get_request(mc_state_t state, int *value)
             break;
 
           case REQ_COMM_TESTANY:
+            start_count = procstate->interleave_count;
             *value = -1;
-            if(MC_request_testany_fail(&process->request)){
-              procstate->state = MC_DONE;
-              return &process->request;
-            }
-
             while(procstate->interleave_count < xbt_dynar_length(process->request.comm_testany.comms)){
               if(MC_request_is_enabled_by_idx(&process->request, procstate->interleave_count++)){
                 *value = procstate->interleave_count - 1;
@@ -154,7 +164,7 @@ smx_req_t MC_state_get_request(mc_state_t state, int *value)
             if(procstate->interleave_count >= xbt_dynar_length(process->request.comm_testany.comms))
               procstate->state = MC_DONE;
 
-            if(*value != -1)
+            if(*value != -1 || start_count == 0)
               return &process->request;
 
             break;