merge conflicts

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

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index abc9a87..128e06d 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -30,6 +30,7 @@ mc_stats_t mc_stats = NULL;
 xbt_fifo_t mc_stack_liveness_stateful = NULL;
 mc_stats_pair_t mc_stats_pair = NULL;
 xbt_fifo_t mc_stack_liveness_stateless = NULL;
+mc_snapshot_t initial_snapshot_liveness = NULL;
 
 
 /**
@@ -116,12 +117,12 @@ void MC_init_liveness_stateful(xbt_automaton_t a){
 
   MC_UNSET_RAW_MEM;
 
-  MC_ddfs_stateful_init(a);
+  //MC_ddfs_stateful_init(a);
   //MC_dpor2_init(a);
   //MC_dpor3_init(a);
 }
 
-void MC_init_liveness_stateless(xbt_automaton_t a){
+void MC_init_liveness_stateless(xbt_automaton_t a, char *prgm){
 
   XBT_DEBUG("Start init mc");
   
@@ -142,7 +143,7 @@ void MC_init_liveness_stateless(xbt_automaton_t a){
 
   MC_UNSET_RAW_MEM;
 
-  MC_ddfs_stateless_init(a);
+  MC_ddfs_stateless_init(a, prgm);
 
   
 }
@@ -167,8 +168,8 @@ void MC_modelcheck_liveness_stateful(xbt_automaton_t a){
   MC_exit_liveness();
 }
 
-void MC_modelcheck_liveness_stateless(xbt_automaton_t a){
-  MC_init_liveness_stateless(a);
+void MC_modelcheck_liveness_stateless(xbt_automaton_t a, char *prgm){
+  MC_init_liveness_stateless(a, prgm);
   MC_exit_liveness();
 }
 
@@ -176,7 +177,8 @@ void MC_exit_liveness(void)
 {
   MC_print_statistics_pairs(mc_stats_pair);
   //xbt_free(mc_time);
-  MC_memory_exit();
+  //MC_memory_exit();
+  exit(0);
 }
 
 
@@ -203,7 +205,7 @@ void MC_wait_for_requests(void)
   smx_req_t req;
   unsigned int iter;
 
-  while (xbt_dynar_length(simix_global->process_to_run)) {
+  while (!xbt_dynar_is_empty(simix_global->process_to_run)) {
     SIMIX_process_runall();
     xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
       req = &process->request;
@@ -282,7 +284,7 @@ void MC_replay(xbt_fifo_t stack)
   XBT_DEBUG("**** End Replay ****");
 }
 
-void MC_replay_liveness(xbt_fifo_t stack)
+void MC_replay_liveness(xbt_fifo_t stack, int all_stack)
 {
   int value;
   char *req_str;
@@ -295,47 +297,91 @@ void MC_replay_liveness(xbt_fifo_t stack)
   XBT_DEBUG("**** Begin Replay ****");
 
   /* Restore the initial state */
-  MC_restore_snapshot(initial_snapshot);
+  MC_restore_snapshot(initial_snapshot_liveness);
   /* At the moment of taking the snapshot the raw heap was set, so restoring
    * it will set it back again, we have to unset it to continue  */
   MC_UNSET_RAW_MEM;
 
-  /* Traverse the stack from the initial state and re-execute the transitions */
-  for (item = xbt_fifo_get_last_item(stack);
-       item != xbt_fifo_get_first_item(stack);
-       item = xbt_fifo_get_prev_item(item)) {
+  if(all_stack){
+
+    item = xbt_fifo_get_last_item(stack);
 
-    pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item);
-    state = (mc_state_t) pair->graph_state;
+    while(depth <= xbt_fifo_size(stack)){
 
-    if(pair->requests > 0){
+      pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item);
+      state = (mc_state_t) pair->graph_state;
+
+      if(pair->requests > 0){
    
-      saved_req = MC_state_get_executed_request(state, &value);
-      //XBT_DEBUG("SavedReq->call %u", saved_req->call);
+       saved_req = MC_state_get_executed_request(state, &value);
+       //XBT_DEBUG("SavedReq->call %u", saved_req->call);
       
-      if(saved_req != NULL){
-       /* because we got a copy of the executed request, we have to fetch the  
-          real one, pointed by the request field of the issuer process */
-       req = &saved_req->issuer->request;
-       //XBT_DEBUG("Req->call %u", req->call);
+       if(saved_req != NULL){
+         /* because we got a copy of the executed request, we have to fetch the  
+            real one, pointed by the request field of the issuer process */
+         req = &saved_req->issuer->request;
+         //XBT_DEBUG("Req->call %u", req->call);
        
-       /* Debug information */
-       if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
-         req_str = MC_request_to_string(req, value);
-         XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state);
-         xbt_free(req_str);
-       }
+         /* Debug information */
+         if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
+           req_str = MC_request_to_string(req, value);
+           XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state);
+           xbt_free(req_str);
+         }
        
-      }
+       }
  
-      SIMIX_request_pre(req, value);
-      MC_wait_for_requests();
+       SIMIX_request_pre(req, value);
+       MC_wait_for_requests();
+      }
+
+      depth++;
+    
+      /* Update statistics */
+      mc_stats_pair->visited_pairs++;
+
+      item = xbt_fifo_get_prev_item(item);
     }
 
-    depth++;
+  }else{
+
+    /* Traverse the stack from the initial state and re-execute the transitions */
+    for (item = xbt_fifo_get_last_item(stack);
+        item != xbt_fifo_get_first_item(stack);
+        item = xbt_fifo_get_prev_item(item)) {
+
+      pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item);
+      state = (mc_state_t) pair->graph_state;
+
+      if(pair->requests > 0){
+   
+       saved_req = MC_state_get_executed_request(state, &value);
+       //XBT_DEBUG("SavedReq->call %u", saved_req->call);
+      
+       if(saved_req != NULL){
+         /* because we got a copy of the executed request, we have to fetch the  
+            real one, pointed by the request field of the issuer process */
+         req = &saved_req->issuer->request;
+         //XBT_DEBUG("Req->call %u", req->call);
+       
+         /* Debug information */
+         if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
+           req_str = MC_request_to_string(req, value);
+           XBT_DEBUG("Replay (depth = %d) : %s (%p)", depth, req_str, state);
+           xbt_free(req_str);
+         }
+       
+       }
+ 
+       SIMIX_request_pre(req, value);
+       MC_wait_for_requests();
+      }
+
+      depth++;
     
-    /* Update statistics */
-    mc_stats_pair->visited_pairs++;
+      /* Update statistics */
+      mc_stats_pair->visited_pairs++;
+    }
   }  
 
   XBT_DEBUG("**** End Replay ****");