X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7eef6ff4f8ba36e883886a74151b8edef45189e2..a0c5f40f68a69e5fd2c22643c98aed7570191e21:/src/mc/mc_global.c

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 62a5d2973c..461f6c0f20 100644
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -1,323 +1,665 @@
+/* Copyright (c) 2008-2012 Da SimGrid Team. All rights reserved.            */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <sys/time.h>
+
 #include "../surf/surf_private.h"
-#include "../simix/private.h"
+#include "../simix/smx_private.h"
 #include "xbt/fifo.h"
-#include "private.h"
+#include "mc_private.h"
+#include "xbt/automaton.h"
 
+XBT_LOG_NEW_CATEGORY(mc, "All MC categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
-				"Logging specific to MC (global)");
+                                "Logging specific to MC (global)");
+
+/* Configuration support */
+e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset;
+
+extern int _surf_init_status;
+void _mc_cfg_cb_reduce(const char *name, int pos) {
+  if (_surf_init_status && !_surf_do_model_check) {
+    xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+  }
+  char *val= xbt_cfg_get_string(_surf_cfg_set, name);
+  if (!strcasecmp(val,"none")) {
+    mc_reduce_kind = e_mc_reduce_none;
+  } else if (!strcasecmp(val,"dpor")) {
+    mc_reduce_kind = e_mc_reduce_dpor;
+  } else {
+    xbt_die("configuration option %s can only take 'none' or 'dpor' as a value",name);
+  }
+  xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+}
+
+void _mc_cfg_cb_checkpoint(const char *name, int pos) {
+  if (_surf_init_status && !_surf_do_model_check) {
+    xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+  }
+  _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name);
+  xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+}
+void _mc_cfg_cb_property(const char *name, int pos) {
+  if (_surf_init_status && !_surf_do_model_check) {
+    xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+  }
+  _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name);
+  xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
+}
+
 
 /* MC global data structures */
-mc_snapshot_t initial_snapshot = NULL;
-xbt_fifo_t mc_stack = NULL;
-xbt_setset_t mc_setset = NULL;
-mc_stats_t mc_stats = NULL;
+
 mc_state_t mc_current_state = NULL;
 char mc_replay_mode = FALSE;
+double *mc_time = NULL;
+mc_snapshot_t initial_snapshot = NULL;
+int raw_mem_set;
+
+/* Safety */
+
+xbt_fifo_t mc_stack_safety = NULL;
+mc_stats_t mc_stats = NULL;
+
+/* Liveness */
+
+mc_stats_pair_t mc_stats_pair = NULL;
+xbt_fifo_t mc_stack_liveness = NULL;
+mc_snapshot_t initial_snapshot_liveness = NULL;
+int compare;
+
+xbt_automaton_t _mc_property_automaton = NULL;
+
+static void MC_assert_pair(int prop);
+
+void MC_do_the_modelcheck_for_real() {
+  if (!_surf_mc_property_file || _surf_mc_property_file[0]=='\0') {
+    if (mc_reduce_kind==e_mc_reduce_unset)
+      mc_reduce_kind=e_mc_reduce_dpor;
+
+    XBT_INFO("Check a safety property");
+    MC_modelcheck();
+
+  } else  {
+
+    if (mc_reduce_kind==e_mc_reduce_unset)
+      mc_reduce_kind=e_mc_reduce_none;
+
+    XBT_INFO("Check the liveness property %s",_surf_mc_property_file);
+    MC_automaton_load(_surf_mc_property_file);
+    MC_modelcheck_liveness();
+  }
+}
 
 /**
  *  \brief Initialize the model-checker data structures
  */
-void MC_init(int method)
-{   
+void MC_init_safety(void)
+{
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   /* Check if MC is already initialized */
-  if(initial_snapshot)
+  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;
   
+  MC_SET_RAW_MEM;
+
   /* Initialize statistics */
   mc_stats = xbt_new0(s_mc_stats_t, 1);
   mc_stats->state_size = 1;
-  
+
   /* Create exploration stack */
-  mc_stack = xbt_fifo_new();
+  mc_stack_safety = xbt_fifo_new();
+
+  MC_UNSET_RAW_MEM;
+
+  MC_dpor_init();
 
-  /* Create the container for the sets */
-  mc_setset = xbt_setset_new(20);
-  
-  switch(method){
-    case 0:
-      MC_dfs_init();
-      break;
-    case 1:
-      MC_dpor_init();
-      break;
-    default:
-      break;
-  }
-  
-  /* Save the initial state */
   MC_SET_RAW_MEM;
-  initial_snapshot = xbt_new(s_mc_snapshot_t,1);	
+  /* Save the initial state */
+  initial_snapshot = xbt_new0(s_mc_snapshot_t, 1);
   MC_take_snapshot(initial_snapshot);
   MC_UNSET_RAW_MEM;
-}
-
-void MC_modelcheck(int method)
-{
 
-  MC_init(method);
 
-  switch(method){
-    case 0:
-      MC_dfs();
-      break;
-    case 1:
-      MC_dpor();
-      break;
-    default:
-      break;
-  }
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
+}
 
-  MC_exit(method);
+void MC_compare(void){
+  compare = 1;
 }
 
-void MC_exit(int method)
+
+void MC_modelcheck(void)
 {
-  mc_state_t state;
+  MC_init_safety();
+  MC_dpor();
+  MC_exit();
+}
+
+void MC_modelcheck_liveness(){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+  /* init stuff */
+  XBT_DEBUG("Start init mc");
   
-  switch(method){
-    case 0:
-      //MC_dfs_exit();
-      break;
-    case 1:
-      //MC_dpor_exit();
-      break;
-    default:
-      break;
-  }
-   
-  /* Destroy MC data structures (in RAW memory) */
+  mc_time = xbt_new0(double, simix_process_maxpid);
+
+  compare = 0;
+
+  /* Initialize the data structures that must be persistent across every
+     iteration of the model-checker (in RAW memory) */
+
   MC_SET_RAW_MEM;
-  xbt_free(mc_stats);
 
-  while( (state = (mc_state_t)xbt_fifo_pop(mc_stack)) != NULL )
-    MC_state_delete(state);
-  
-  xbt_fifo_free(mc_stack);
-  xbt_setset_destroy(mc_setset);
+  /* Initialize statistics */
+  mc_stats_pair = xbt_new0(s_mc_stats_pair_t, 1);
+
+  XBT_DEBUG("Creating stack");
+
+  /* Create exploration stack */
+  mc_stack_liveness = xbt_fifo_new();
+
   MC_UNSET_RAW_MEM;
+
+
+  MC_ddfs_init();
+
+  /* We're done */
+  MC_print_statistics_pairs(mc_stats_pair);
+  xbt_free(mc_time);
+  MC_memory_exit();
+  exit(0);
+}
+
+
+void MC_exit(void)
+{
+  MC_print_statistics(mc_stats);
+  xbt_free(mc_time);
+  MC_memory_exit();
 }
 
+
 int MC_random(int min, int max)
 {
-  MC_random_create(min,max);
-  SIMIX_process_yield();
+  /*FIXME: return mc_current_state->executed_transition->random.value;*/
+  return 0;
+}
 
-  if(!mc_replay_mode)
-    return mc_current_state->executed_transition->current_value;
-  else
-    return mc_current_state->executed_transition->current_value - 1;
+/**
+ * \brief Schedules all the process that are ready to run
+ */
+void MC_wait_for_requests(void)
+{
+  smx_process_t process;
+  smx_simcall_t req;
+  unsigned int iter;
+
+  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->simcall;
+      if (req->call != SIMCALL_NONE && !MC_request_is_visible(req))
+        SIMIX_simcall_pre(req, 0);
+    }
+  }
+}
+
+int MC_deadlock_check()
+{
+  int deadlock = FALSE;
+  smx_process_t process;
+  if(xbt_swag_size(simix_global->process_list)){
+    deadlock = TRUE;
+    xbt_swag_foreach(process, simix_global->process_list){
+      if(process->simcall.call != SIMCALL_NONE
+         && MC_request_is_enabled(&process->simcall)){
+        deadlock = FALSE;
+        break;
+      }
+    }
+  }
+  return deadlock;
 }
 
 /**
- * \brief Re-executes from the initial state all the transitions indicated by
+ * \brief Re-executes from the state at position start all the transitions indicated by
  *        a given model-checker stack.
  * \param stack The stack with the transitions to execute.
-*/
-void MC_replay(xbt_fifo_t stack)
+ * \param start Start index to begin the re-execution.
+ */
+void MC_replay(xbt_fifo_t stack, int start)
 {
-  xbt_fifo_item_t item;
-  mc_transition_t trans;
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
-  DEBUG0("**** Begin Replay ****");
+  int value, i = 1;
+  char *req_str;
+  smx_simcall_t req = NULL, saved_req = NULL;
+  xbt_fifo_item_t item, start_item;
+  mc_state_t state;
 
-  /* Restore the initial state */
-  MC_restore_snapshot(initial_snapshot);
+  XBT_DEBUG("**** Begin Replay ****");
 
-  mc_replay_mode = TRUE;
-  
-  MC_UNSET_RAW_MEM;
+  if(start == -1){
+    /* Restore the initial state */
+    MC_restore_snapshot(initial_snapshot);
+    /* 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)){
+  start_item = xbt_fifo_get_last_item(stack);
+  if(start != -1){
+    while (i != start){
+      start_item = xbt_fifo_get_prev_item(start_item);
+      i++;
+    }
+  }
 
-    mc_current_state = (mc_state_t) xbt_fifo_get_item_content(item);
-    trans = mc_current_state->executed_transition;
+  /* Traverse the stack from the state at position start and re-execute the transitions */
+  for (item = start_item;
+       item != xbt_fifo_get_first_item(stack);
+       item = xbt_fifo_get_prev_item(item)) {
 
+    state = (mc_state_t) xbt_fifo_get_item_content(item);
+    saved_req = MC_state_get_executed_request(state, &value);
+   
+    if(saved_req){
+      /* 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->simcall;
+
+      /* 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);
+      }
+    }
+         
+    SIMIX_simcall_pre(req, value);
+    MC_wait_for_requests();
+         
     /* Update statistics */
     mc_stats->visited_states++;
     mc_stats->executed_transitions++;
+  }
+  XBT_DEBUG("**** End Replay ****");
 
-    DEBUG1("Executing transition %s", trans->name);
-    SIMIX_process_schedule(trans->process);
-
-    /* Do all surf's related black magic tricks to keep all working */
-    MC_execute_surf_actions();
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 
-    /* Schedule every process that got enabled due to the executed transition */
-    MC_schedule_enabled_processes();
-  }
-  mc_replay_mode = FALSE;
-  DEBUG0("**** End Replay ****");
 }
 
-/**
- * \brief Dumps the contents of a model-checker's stack and shows the actual
- *        execution trace
- * \param stack The stack to dump
-*/
-void MC_dump_stack(xbt_fifo_t stack)
+void MC_replay_liveness(xbt_fifo_t stack, int all_stack)
 {
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+  int value;
+  char *req_str;
+  smx_simcall_t req = NULL, saved_req = NULL;
+  xbt_fifo_item_t item;
   mc_state_t state;
+  mc_pair_stateless_t pair;
+  int depth = 1;
 
-  MC_show_stack(stack);
-  
-  MC_SET_RAW_MEM;
-  while( (state = (mc_state_t)xbt_fifo_pop(stack)) != NULL )
-    MC_state_delete(state);
+  XBT_DEBUG("**** Begin Replay ****");
+
+  /* Restore the initial state */
+  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;
-}
 
-void MC_show_stack(xbt_fifo_t stack)
-{
-  mc_state_t state;
-  mc_transition_t trans;
-  xbt_fifo_item_t item;
+  if(all_stack){
 
-  for(item=xbt_fifo_get_last_item(stack);
-     (item?(state=(mc_state_t)(xbt_fifo_get_item_content(item))):(NULL));
-      item=xbt_fifo_get_prev_item(item)){
-    trans = state->executed_transition;
-    if(trans){      
-      INFO1("%s", trans->name);  
+    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){
+   
+        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->simcall;
+          //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_simcall_pre(req, value);
+        MC_wait_for_requests();
+      }
+
+      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->simcall;
+          //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_simcall_pre(req, value);
+        MC_wait_for_requests();
+      }
+
+      depth++;
+    
+      /* Update statistics */
+      mc_stats_pair->visited_pairs++;
+    }
+  }  
+
+  XBT_DEBUG("**** End Replay ****");
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 }
 
 /**
- * \brief Schedules all the process that are ready to run
- *        As a side effect it performs some clean-up required by SIMIX 
+ * \brief Dumps the contents of a model-checker's stack and shows the actual
+ *        execution trace
+ * \param stack The stack to dump
  */
-void MC_schedule_enabled_processes(void)
+void MC_dump_stack_safety(xbt_fifo_t stack)
 {
-  smx_process_t process;
+  
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+  MC_show_stack_safety(stack);
+
+  if(!_surf_mc_checkpoint){
+
+    mc_state_t state;
 
-  //SIMIX_process_empty_trash();
+    MC_SET_RAW_MEM;
+    while ((state = (mc_state_t) xbt_fifo_pop(stack)) != NULL)
+      MC_state_delete(state);
+    MC_UNSET_RAW_MEM;
 
-  /* Schedule every process that is ready to run due to an finished action */
-  while ((process = xbt_swag_extract(simix_global->process_to_run))) {
-    DEBUG2("Scheduling %s on %s", process->name, process->smx_host->name);
-    SIMIX_process_schedule(process);
   }
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 }
 
-/******************************** States **************************************/
 
-/**
- * \brief Creates a state data structure used by the exploration algorithm
- */
-mc_state_t MC_state_new(void)
+void MC_show_stack_safety(xbt_fifo_t stack)
 {
-  mc_state_t state = NULL; 
-  
-  state = xbt_new0(s_mc_state_t, 1);
-  state->created_transitions = xbt_setset_new_set(mc_setset);
-  state->transitions = xbt_setset_new_set(mc_setset);
-  state->enabled_transitions = xbt_setset_new_set(mc_setset);
-  state->interleave = xbt_setset_new_set(mc_setset);
-  state->done = xbt_setset_new_set(mc_setset);
-  state->executed_transition = NULL;
-
-  mc_stats->expanded_states++;
+  int value;
+  mc_state_t state;
+  xbt_fifo_item_t item;
+  smx_simcall_t req;
+  char *req_str = NULL;
   
-  return state;
+  for (item = xbt_fifo_get_last_item(stack);
+       (item ? (state = (mc_state_t) (xbt_fifo_get_item_content(item)))
+        : (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, value);
+      XBT_INFO("%s", req_str);
+      xbt_free(req_str);
+    }
+  }
 }
-/**
- * \brief Deletes a state data structure
- * \param trans The state to be deleted
- */
-void MC_state_delete(mc_state_t state)
+
+void MC_show_deadlock(smx_simcall_t req)
 {
-  xbt_setset_cursor_t cursor;
-  mc_transition_t trans;  
+  /*char *req_str = NULL;*/
+  XBT_INFO("**************************");
+  XBT_INFO("*** DEAD-LOCK DETECTED ***");
+  XBT_INFO("**************************");
+  XBT_INFO("Locked request:");
+  /*req_str = MC_request_to_string(req);
+    XBT_INFO("%s", req_str);
+    xbt_free(req_str);*/
+  XBT_INFO("Counter-example execution trace:");
+  MC_dump_stack_safety(mc_stack_safety);
+}
+
+
+void MC_show_stack_liveness(xbt_fifo_t stack){
+  int value;
+  mc_pair_stateless_t pair;
+  xbt_fifo_item_t item;
+  smx_simcall_t req;
+  char *req_str = NULL;
   
-  xbt_setset_foreach(state->created_transitions, cursor, trans){
-    MC_transition_delete(trans);
+  for (item = xbt_fifo_get_last_item(stack);
+       (item ? (pair = (mc_pair_stateless_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){
+      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");
+      }
+    }
   }
+}
 
-  xbt_setset_destroy_set(state->created_transitions);
-  xbt_setset_destroy_set(state->transitions);
-  xbt_setset_destroy_set(state->enabled_transitions);
-  xbt_setset_destroy_set(state->interleave);
-  xbt_setset_destroy_set(state->done);
+void MC_dump_stack_liveness(xbt_fifo_t stack){
 
-  xbt_free(state);
-}
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
-/************************** SURF Emulation ************************************/
+  mc_pair_stateless_t pair;
 
-/* Dirty hack, we manipulate surf's clock to simplify the integration of the
-   model-checker */
-extern double NOW;
+  MC_SET_RAW_MEM;
+  while ((pair = (mc_pair_stateless_t) xbt_fifo_pop(stack)) != NULL)
+    MC_pair_stateless_delete(pair);
+  MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
 
-/**
- * \brief Executes all the actions at every model
- */
-void MC_execute_surf_actions(void)
-{
-  unsigned int iter;
-  surf_action_t action = NULL;
-  surf_model_t model = NULL;
-  smx_action_t smx_action = NULL;
-
-  /* Execute all the actions in every model */
-  xbt_dynar_foreach(model_list, iter, model){
-    while ((action = xbt_swag_extract(model->states.running_action_set))){
-      /* FIXME: timeouts are not calculated correctly */
-      if(NOW >= action->max_duration){ 
-        surf_action_state_set(action, SURF_ACTION_DONE);
-        smx_action = action->data;
-        DEBUG5("Resource [%s] (%d): Executing RUNNING action \"%s\" (%p) MaxDuration %lf", 
-          model->name, xbt_swag_size(model->states.running_action_set),
-          smx_action->name, smx_action, action->max_duration);
-
-        if(smx_action)
-          SIMIX_action_signal_all(smx_action);
-      }
-    }
-    /*FIXME: check if this is always empty or not */
-    while ((action = xbt_swag_extract(model->states.failed_action_set))) {
-      smx_action = action->data;
-      DEBUG4("Resource [%s] (%d): Executing FAILED action \"%s\" (%p)", 
-        model->name, xbt_swag_size(model->states.running_action_set),
-        smx_action->name, smx_action);
-      if (smx_action)
-       SIMIX_action_signal_all(smx_action);
-    }
-  }
-  /* That's it, now go one step deeper into the model-checking process! */
-  NOW += 0.5;  /* FIXME: Check time increases*/
 }
 
-/****************************** Statistics ************************************/
+
 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",
-    (double)stats->visited_states / stats->expanded_states);
-  /*INFO1("Exploration coverage = %lf", 
-    (double)stats->expanded_states / stats->state_size);*/
+  //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);
+  /*XBT_INFO("Exploration coverage = %lf",
+    (double)stats->expanded_states / stats->state_size); */
+}
+
+void MC_print_statistics_pairs(mc_stats_pair_t stats)
+{
+  XBT_INFO("Expanded pairs = %lu", stats->expanded_pairs);
+  XBT_INFO("Visited pairs = %lu", stats->visited_pairs);
+  //XBT_INFO("Executed transitions = %lu", stats->executed_transitions);
+  XBT_INFO("Expanded / Visited = %lf",
+           (double) stats->visited_pairs / stats->expanded_pairs);
+  /*XBT_INFO("Exploration coverage = %lf",
+    (double)stats->expanded_states / stats->state_size); */
 }
 
-/************************* Assertion Checking *********************************/
 void MC_assert(int prop)
 {
-  if(!prop){
-    INFO0("**************************");
-    INFO0("*** PROPERTY NOT VALID ***");
-    INFO0("**************************");
-    INFO0("Counter-example execution trace:");
-    MC_dump_stack(mc_stack);
+  if (MC_IS_ENABLED && !prop){
+    XBT_INFO("**************************");
+    XBT_INFO("*** PROPERTY NOT VALID ***");
+    XBT_INFO("**************************");
+    XBT_INFO("Counter-example execution trace:");
+    MC_dump_stack_safety(mc_stack_safety);
     MC_print_statistics(mc_stats);
     xbt_abort();
   }
 }
 
+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(mc_stack_liveness);
+    //MC_dump_snapshot_stack(mc_snapshot_stack);
+    MC_print_statistics_pairs(mc_stats_pair);
+    xbt_abort();
+  }
+}
+
+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;
+}
+
+void MC_diff(void){
+
+  mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1);
+  MC_take_snapshot_liveness(sn);
+
+  int i;
+
+  XBT_INFO("Number of regions : %u", sn->num_reg);
+
+  for(i=0; i<sn->num_reg; i++){
+    
+    switch(sn->regions[i]->type){
+    case 0: /* heap */
+      XBT_INFO("Size of heap : %zu", sn->regions[i]->size);
+      break;
+    case 1 : /* libsimgrid */
+      XBT_INFO("Size of libsimgrid : %zu", sn->regions[i]->size);
+      break;
+    case 2 : /* data program */
+      XBT_INFO("Size of data program : %zu", sn->regions[i]->size);
+      break;
+    case 3 : /* stack */
+      XBT_INFO("Size of stack : %zu", sn->regions[i]->size);
+      XBT_INFO("Start addr of stack : %p", sn->regions[i]->start_addr);
+      break;
+    }
+
+  }
+
+}
+
+void MC_automaton_load(const char *file){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+  MC_SET_RAW_MEM;
+
+  if (_mc_property_automaton == NULL)
+    _mc_property_automaton = xbt_automaton_new();
+  
+  xbt_automaton_load(_mc_property_automaton,file);
+
+  MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+
+}
+
+void MC_automaton_new_propositional_symbol(const char* id, void* fct) {
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
+  MC_SET_RAW_MEM;
+
+  if (_mc_property_automaton == NULL)
+    _mc_property_automaton = xbt_automaton_new();
+
+  xbt_new_propositional_symbol(_mc_property_automaton,id,fct);
+
+  MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
+}