Improve independence detection and request pretty printing.

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

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 4ac7758..22b3058 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -17,7 +17,7 @@ xbt_fifo_t mc_stack = NULL;
 mc_stats_t mc_stats = NULL;
 mc_state_t mc_current_state = NULL;
 char mc_replay_mode = FALSE;
-
+double *mc_time = NULL;
 /**
  *  \brief Initialize the model-checker data structures
  */
@@ -27,6 +27,8 @@ void MC_init(void)
   if (initial_snapshot)
     return;
 
+  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;
@@ -58,6 +60,7 @@ void MC_modelcheck(void)
 
 void MC_exit(void)
 {
+  xbt_free(mc_time);
   MC_memory_exit();
 }
 
@@ -72,7 +75,6 @@ int MC_random(int min, int max)
  */
 void MC_wait_for_requests(void)
 {
-  char *req_str = NULL;
   smx_req_t req = NULL;
 
   do {
@@ -80,11 +82,6 @@ void MC_wait_for_requests(void)
     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);
-      }
     }
   } while (xbt_dynar_length(simix_global->process_to_run));
 }
@@ -142,7 +139,7 @@ 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); 
+        req_str = MC_request_to_string(req, value);
         DEBUG2("Replay: %s (%p)", req_str, state);
         xbt_free(req_str);
       }
@@ -188,7 +185,7 @@ 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){
-      req_str = MC_request_to_string(req); 
+      req_str = MC_request_to_string(req, value);
       INFO1("%s", req_str);
       xbt_free(req_str);
     }
@@ -234,3 +231,15 @@ void MC_assert(int prop)
   }
 }
 
+void MC_process_clock_add(smx_process_t process, double amount)
+{
+  mc_time[process->pid] += amount;
+}
+
+double MC_process_clock_get(smx_process_t process)
+{
+  if(mc_time)
+    return mc_time[process->pid];
+  else
+    return 0;
+}