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

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index addfdbbcc4..a1953a4c6d 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -27,9 +27,15 @@ mc_stats_t mc_stats = NULL;
 
 /* Liveness */
 
-xbt_fifo_t mc_stack_liveness_stateful = NULL;
 mc_stats_pair_t mc_stats_pair = NULL;
-xbt_fifo_t mc_stack_liveness_stateless = NULL;
+xbt_fifo_t mc_stack_liveness = NULL;
+mc_snapshot_t initial_snapshot_liveness = NULL;
+
+xbt_automaton_t automaton;
+char *prog_name;
+
+static void MC_init_liveness(xbt_automaton_t a, char *prgm);
+static void MC_assert_pair(int prop);
 
 
 /**
@@ -93,36 +99,7 @@ void MC_init_safety_stateful(void){
 
 }
 
-void MC_init_liveness_stateful(xbt_automaton_t a){
-
-  XBT_DEBUG("Start init mc");
-  
-  mc_time = xbt_new0(double, simix_process_maxpid);
-
-  /* Initialize the data structures that must be persistent across every
-     iteration of the model-checker (in RAW memory) */
-
-  MC_SET_RAW_MEM;
-
-  /* Initialize statistics */
-  mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1);
-  //mc_stats = xbt_new0(s_mc_stats_t, 1);
-
-  XBT_DEBUG("Creating snapshot_stack");
-
- /* Create exploration stack */
-  mc_stack_liveness_stateful = xbt_fifo_new();
-
-
-  MC_UNSET_RAW_MEM;
-
-  //MC_vddfs_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){
+static void MC_init_liveness(xbt_automaton_t a, char *prgm){
 
   XBT_DEBUG("Start init mc");
   
@@ -139,11 +116,14 @@ void MC_init_liveness_stateless(xbt_automaton_t a){
   XBT_DEBUG("Creating stack");
 
  /* Create exploration stack */
-  mc_stack_liveness_stateless = xbt_fifo_new();
+  mc_stack_liveness = xbt_fifo_new();
 
   MC_UNSET_RAW_MEM;
 
-  MC_ddfs_stateless_init(a);
+  automaton = a;
+  prog_name = strdup(prgm);
+
+  MC_ddfs_init();
 
   
 }
@@ -163,21 +143,18 @@ void MC_modelcheck_stateful(void)
   MC_exit();
 }
 
-void MC_modelcheck_liveness_stateful(xbt_automaton_t a){
-  MC_init_liveness_stateful(a);
-  MC_exit_liveness();
-}
 
-void MC_modelcheck_liveness_stateless(xbt_automaton_t a){
-  MC_init_liveness_stateless(a);
+void MC_modelcheck_liveness(xbt_automaton_t a, char *prgm){
+  MC_init_liveness(a, prgm);
   MC_exit_liveness();
 }
 
 void MC_exit_liveness(void)
 {
   MC_print_statistics_pairs(mc_stats_pair);
-  xbt_free(mc_time);
-  MC_memory_exit();
+  //xbt_free(mc_time);
+  //MC_memory_exit();
+  exit(0);
 }
 
 
@@ -204,7 +181,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;
@@ -283,7 +260,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;
@@ -291,45 +268,98 @@ 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 ****");
 
   /* 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){
 
-    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);
+    item = xbt_fifo_get_last_item(stack);
+
+    while(depth <= xbt_fifo_size(stack)){
+
+      pair = (mc_pair_stateless_t) xbt_fifo_get_item_content(item);
+      state = (mc_state_t) pair->graph_state;
+
+      if(pair->requests > 0){
    
-    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);
+	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();
+      }
 
-      /* 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);
+      depth++;
+    
+      /* Update statistics */
+      mc_stats_pair->visited_pairs++;
+
+      item = xbt_fifo_get_prev_item(item);
+    }
+
+  }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++;
     }
-         
-    SIMIX_request_pre(req, value);
-    MC_wait_for_requests();
-         
-    /* Update statistics */
-    mc_stats_pair->visited_pairs++;
-  }
+  }  
+
   XBT_DEBUG("**** End Replay ****");
 }
 
@@ -433,35 +463,8 @@ void MC_show_stack_safety_stateful(xbt_fifo_t stack)
   }
 }
 
-void MC_show_stack_liveness_stateful(xbt_fifo_t stack){
-  int value;
-  mc_pair_t pair;
-  xbt_fifo_item_t item;
-  smx_req_t req;
-  char *req_str = NULL;
-  
-  for (item = xbt_fifo_get_last_item(stack);
-       (item ? (pair = (mc_pair_t) (xbt_fifo_get_item_content(item)))
-        : (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);
-    }
-  }
-}
-
-void MC_dump_stack_liveness_stateful(xbt_fifo_t stack){
-  mc_pair_t pair;
-
-  MC_SET_RAW_MEM;
-  while ((pair = (mc_pair_t) xbt_fifo_pop(stack)) != NULL)
-    MC_pair_delete(pair);
-  MC_UNSET_RAW_MEM;
-}
 
-void MC_show_stack_liveness_stateless(xbt_fifo_t stack){
+void MC_show_stack_liveness(xbt_fifo_t stack){
   int value;
   mc_pair_stateless_t pair;
   xbt_fifo_item_t item;
@@ -473,14 +476,18 @@ 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");
+      }
     }
   }
 }
 
-void MC_dump_stack_liveness_stateless(xbt_fifo_t stack){
+void MC_dump_stack_liveness(xbt_fifo_t stack){
   mc_pair_stateless_t pair;
 
   MC_SET_RAW_MEM;
@@ -539,26 +546,14 @@ void MC_assert_stateful(int prop)
   }
 }
 
-void MC_assert_pair_stateful(int prop){
-  if (MC_IS_ENABLED && !prop) {
-    XBT_INFO("**************************");
-    XBT_INFO("*** PROPERTY NOT VALID ***");
-    XBT_INFO("**************************");
-    //XBT_INFO("Counter-example execution trace:");
-    MC_show_stack_liveness_stateful(mc_stack_liveness_stateful);
-    //MC_dump_snapshot_stack(mc_snapshot_stack);
-    MC_print_statistics_pairs(mc_stats_pair);
-    xbt_abort();
-  }
-}
 
-void MC_assert_pair_stateless(int prop){
+static void MC_assert_pair(int prop){
   if (MC_IS_ENABLED && !prop) {
     XBT_INFO("**************************");
     XBT_INFO("*** PROPERTY NOT VALID ***");
     XBT_INFO("**************************");
     //XBT_INFO("Counter-example execution trace:");
-    MC_show_stack_liveness_stateless(mc_stack_liveness_stateless);
+    MC_show_stack_liveness(mc_stack_liveness);
     //MC_dump_snapshot_stack(mc_snapshot_stack);
     MC_print_statistics_pairs(mc_stats_pair);
     xbt_abort();