model-checker : init list of irrelevant differences in simix instead of msg

[simgrid.git] / src / msg / msg_global.c

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 681bdef..16f3507 100644 (file)
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -21,8 +21,9 @@ MSG_Global_t msg_global = NULL;
 
 /********************************* MSG **************************************/
 
-/* @brief Initialize MSG with less verifications
- *
+/**
+ * \ingroup msg_simulation
+ * \brief Initialize MSG with less verifications
  * You should use the MSG_init() function instead. Failing to do so may turn into PEBKAC some day. You've been warned.
  */
 void MSG_init_nocheck(int *argc, char **argv) {
@@ -48,12 +49,16 @@ void MSG_init_nocheck(int *argc, char **argv) {
     msg_global->process_data_cleanup = NULL;
     msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup));
 
+    if(MC_IS_ENABLED){
+      /* Ignore total amount of messages sent during the simulation for heap comparison */
+      MC_ignore(&(msg_global->sent_msg), sizeof(msg_global->sent_msg));
+    }
+
     /* initialization of the action module */
     _MSG_action_init();
 
     SIMIX_function_register_process_create(MSG_process_create_from_SIMIX);
     SIMIX_function_register_process_cleanup(MSG_process_cleanup_from_SIMIX);
-    SIMIX_function_register_process_kill(MSG_process_kill_from_SIMIX);
   }
 #ifdef HAVE_TRACING
   TRACE_start();
@@ -72,7 +77,7 @@ void MSG_init_nocheck(int *argc, char **argv) {
    parameter.
  * \param number the number of channel in the simulation. It has to be >0
  */
-MSG_error_t MSG_set_channel_number(int number)
+msg_error_t MSG_set_channel_number(int number)
 {
   XBT_WARN("DEPRECATED! Please use aliases instead");
   xbt_assert((msg_global)
@@ -102,32 +107,15 @@ int MSG_get_channel_number(void)
 /** \ingroup msg_simulation
  * \brief Launch the MSG simulation
  */
-MSG_error_t MSG_main(void)
-{
-  /* Clean IO before the run */
-  fflush(stdout);
-  fflush(stderr);
-
-  if (MC_IS_ENABLED) {
-    MC_modelcheck();
-  }
-  else {
-    SIMIX_run();
-  }
-  return MSG_OK;
-}
-
-
-MSG_error_t MSG_main_liveness()
+msg_error_t MSG_main(void)
 {
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
 
-  if (MC_IS_ENABLED) {
-    MC_modelcheck_liveness();
-  }
-  else {
+  if (MC_IS_ENABLED) { 
+    MC_do_the_modelcheck_for_real();
+  } else {
     SIMIX_run();
   }
   return MSG_OK;
@@ -156,7 +144,7 @@ int MSG_process_killall(int reset_PIDs)
 /** \ingroup msg_simulation
  * \brief Clean the MSG simulation
  */
-MSG_error_t MSG_clean(void)
+msg_error_t MSG_clean(void)
 {
   XBT_DEBUG("Closing MSG");