X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1f3dc5fab0ccdb98c1c77fdb2f96f662ea3e45a2..1fe9c42d64bd7524b7d24df2b1fcc6e6e37d6a6b:/src/mc/mc_global.c

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index addfdbbcc4..abc9a87da7 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -116,7 +116,6 @@ void MC_init_liveness_stateful(xbt_automaton_t a){
 
   MC_UNSET_RAW_MEM;
 
-  //MC_vddfs_stateful_init(a);
   MC_ddfs_stateful_init(a);
   //MC_dpor2_init(a);
   //MC_dpor3_init(a);
@@ -176,7 +175,7 @@ void MC_modelcheck_liveness_stateless(xbt_automaton_t a){
 void MC_exit_liveness(void)
 {
   MC_print_statistics_pairs(mc_stats_pair);
-  xbt_free(mc_time);
+  //xbt_free(mc_time);
   MC_memory_exit();
 }
 
@@ -291,6 +290,7 @@ void MC_replay_liveness(xbt_fifo_t stack)
   xbt_fifo_item_t item;
   mc_state_t state;
   mc_pair_stateless_t pair;
+  int depth = 1;
 
   XBT_DEBUG("**** Begin Replay ****");
 
@@ -307,29 +307,37 @@ void MC_replay_liveness(xbt_fifo_t stack)
 
     pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item);
     state = (mc_state_t) pair->graph_state;
-    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: %s (%p)", req_str, state);
-        xbt_free(req_str);
+    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();
     }
-         
-    SIMIX_request_pre(req, value);
-    MC_wait_for_requests();
-         
+
+    depth++;
+    
     /* Update statistics */
     mc_stats_pair->visited_pairs++;
-  }
+  }  
+
   XBT_DEBUG("**** End Replay ****");
 }
 
@@ -473,9 +481,13 @@ void MC_show_stack_liveness_stateless(xbt_fifo_t stack){
         : (NULL)); item = xbt_fifo_get_prev_item(item)) {
     req = MC_state_get_executed_request(pair->graph_state, &value);
     if(req){
-      req_str = MC_request_to_string(req, value);
-      XBT_INFO("%s", req_str);
-      xbt_free(req_str);
+      if(pair->requests>0){
+	req_str = MC_request_to_string(req, value);
+	XBT_INFO("%s", req_str);
+	xbt_free(req_str);
+      }else{
+	XBT_INFO("End of system requests but evolution in Büchi automaton");
+      }
     }
   }
 }