merge branches

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

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index fec467e..1142da7 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -60,6 +60,7 @@ void MC_modelcheck(void)
 
 void MC_exit(void)
 {
+  MC_print_statistics(mc_stats);
   xbt_free(mc_time);
   MC_memory_exit();
 }
@@ -75,21 +76,18 @@ int MC_random(int min, int max)
  */
 void MC_wait_for_requests(void)
 {
-  char *req_str = NULL;
-  smx_req_t req = NULL;
-
-  do {
-    SIMIX_context_runall(simix_global->process_to_run);
-    while((req = SIMIX_request_pop())){
-      if(!MC_request_is_visible(req))
-        SIMIX_request_pre(req, 0);
-      else if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
-        req_str = MC_request_to_string(req);
-        DEBUG1("Got: %s", req_str);
-        xbt_free(req_str);
-      }
+  smx_process_t process;
+  smx_req_t req;
+  unsigned int iter;
+
+  while (xbt_dynar_length(simix_global->process_to_run)) {
+    SIMIX_process_runall();
+    xbt_dynar_foreach(simix_global->process_that_ran, iter, process) {
+      req = &process->request;
+      if (req->call != REQ_NO_REQ && !MC_request_is_visible(req))
+          SIMIX_request_pre(req, 0);
     }
-  } while (xbt_dynar_length(simix_global->process_to_run));
+  }
 }
 
 int MC_deadlock_check()
@@ -122,7 +120,7 @@ void MC_replay(xbt_fifo_t stack)
   xbt_fifo_item_t item;
   mc_state_t state;
 
-  DEBUG0("**** Begin Replay ****");
+  XBT_DEBUG("**** Begin Replay ****");
 
   /* Restore the initial state */
   MC_restore_snapshot(initial_snapshot);
@@ -145,8 +143,8 @@ void MC_replay(xbt_fifo_t stack)
 
       /* Debug information */
       if(XBT_LOG_ISENABLED(mc_global, xbt_log_priority_debug)){
-        req_str = MC_request_to_string(req); 
-        DEBUG2("Replay: %s (%p)", req_str, state);
+        req_str = MC_request_to_string(req, value);
+        XBT_DEBUG("Replay: %s (%p)", req_str, state);
         xbt_free(req_str);
       }
     }
@@ -158,7 +156,7 @@ void MC_replay(xbt_fifo_t stack)
     mc_stats->visited_states++;
     mc_stats->executed_transitions++;
   }
-  DEBUG0("**** End Replay ****");
+  XBT_DEBUG("**** End Replay ****");
 }
 
 /**
@@ -191,14 +189,9 @@ void MC_show_stack(xbt_fifo_t stack)
         : (NULL)); item = xbt_fifo_get_prev_item(item)) {
     req = MC_state_get_executed_request(state, &value);
     if(req){
-      if(req->call == REQ_COMM_WAIT && value == -1)
-        INFO3("[(%lu)%s] Wait Timeout (comm=%p)",
-            req->issuer->pid, req->issuer->name, req->comm_wait.comm);
-      else{
-        req_str = MC_request_to_string(req);
-        INFO1("%s", req_str);
-        xbt_free(req_str);
-      }
+      req_str = MC_request_to_string(req, value);
+      XBT_INFO("%s", req_str);
+      xbt_free(req_str);
     }
   }
 }
@@ -206,36 +199,36 @@ void MC_show_stack(xbt_fifo_t stack)
 void MC_show_deadlock(smx_req_t req)
 {
   /*char *req_str = NULL;*/
-  INFO0("**************************");
-  INFO0("*** DEAD-LOCK DETECTED ***");
-  INFO0("**************************");
-  INFO0("Locked request:");
+  XBT_INFO("**************************");
+  XBT_INFO("*** DEAD-LOCK DETECTED ***");
+  XBT_INFO("**************************");
+  XBT_INFO("Locked request:");
   /*req_str = MC_request_to_string(req);
-  INFO1("%s", req_str);
+  XBT_INFO("%s", req_str);
   xbt_free(req_str);*/
-  INFO0("Counter-example execution trace:");
+  XBT_INFO("Counter-example execution trace:");
   MC_dump_stack(mc_stack);
 }
 
 void MC_print_statistics(mc_stats_t stats)
 {
-  INFO1("State space size ~= %lu", stats->state_size);
-  INFO1("Expanded states = %lu", stats->expanded_states);
-  INFO1("Visited states = %lu", stats->visited_states);
-  INFO1("Executed transitions = %lu", stats->executed_transitions);
-  INFO1("Expanded / Visited = %lf",
+  XBT_INFO("State space size ~= %lu", stats->state_size);
+  XBT_INFO("Expanded states = %lu", stats->expanded_states);
+  XBT_INFO("Visited states = %lu", stats->visited_states);
+  XBT_INFO("Executed transitions = %lu", stats->executed_transitions);
+  XBT_INFO("Expanded / Visited = %lf",
         (double) stats->visited_states / stats->expanded_states);
-  /*INFO1("Exploration coverage = %lf", 
+  /*XBT_INFO("Exploration coverage = %lf",
      (double)stats->expanded_states / stats->state_size); */
 }
 
 void MC_assert(int prop)
 {
   if (MC_IS_ENABLED && !prop) {
-    INFO0("**************************");
-    INFO0("*** PROPERTY NOT VALID ***");
-    INFO0("**************************");
-    INFO0("Counter-example execution trace:");
+    XBT_INFO("**************************");
+    XBT_INFO("*** PROPERTY NOT VALID ***");
+    XBT_INFO("**************************");
+    XBT_INFO("Counter-example execution trace:");
     MC_dump_stack(mc_stack);
     MC_print_statistics(mc_stats);
     xbt_abort();