X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/27a462d1cf6871b14fa32d09a96839fd8ff2c1c0..8d38dfb21cfebee62de388c76de8eaa4e01164a4:/src/msg/msg_global.c?ds=sidebyside

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 127a8dbd82..5aef61aa2a 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -11,6 +11,7 @@
 #include "xbt/log.h"
 #include "xbt/virtu.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
+#include "xbt/replay.h"
 
 XBT_LOG_NEW_CATEGORY(msg, "All MSG categories");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
@@ -20,27 +21,26 @@ MSG_Global_t msg_global = NULL;
 
 /********************************* MSG **************************************/
 
-/** \ingroup msg_simulation
- * \brief Initialize some MSG internal data.
+/**
+ * \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_global_init_args(int *argc, char **argv)
-{
-  MSG_global_init(argc, argv);
-}
+void MSG_init_nocheck(int *argc, char **argv) {
 
-/** \ingroup msg_simulation
- * \brief Initialize some MSG internal data.
- */
-void MSG_global_init(int *argc, char **argv)
-{
 #ifdef HAVE_TRACING
   TRACE_global_init(argc, argv);
 #endif
 
   xbt_getpid = MSG_process_self_PID;
   if (!msg_global) {
+    s_msg_vm_t vm; // to compute the offset
+
     SIMIX_global_init(argc, argv);
 
+    if(MC_IS_ENABLED && mmalloc_ignore == NULL)
+      MC_ignore_init();
+    
     msg_global = xbt_new0(s_MSG_Global_t, 1);
 
 #ifdef MSG_USE_DEPRECATED
@@ -50,14 +50,22 @@ void MSG_global_init(int *argc, char **argv)
     msg_global->sent_msg = 0;
     msg_global->task_copy_callback = NULL;
     msg_global->process_data_cleanup = NULL;
+    msg_global->vms = xbt_swag_new(xbt_swag_offset(vm,all_vms_hookup));
 
     /* 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);
+
+    sg_platf_postparse_add_cb(MSG_post_create_environment);
+  }
+  
+  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));
   }
+
 #ifdef HAVE_TRACING
   TRACE_start();
 #endif
@@ -75,7 +83,7 @@ void MSG_global_init(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)
@@ -105,47 +113,15 @@ int MSG_get_channel_number(void)
 /** \ingroup msg_simulation
  * \brief Launch the MSG simulation
  */
-MSG_error_t MSG_main(void)
+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_stateful(void)
-{
-  /* Clean IO before the run */
-  fflush(stdout);
-  fflush(stderr);
-
-  if (MC_IS_ENABLED) {
-    MC_modelcheck_stateful();
-  }
-  else {
-    SIMIX_run();
-  }
-  return MSG_OK;
-}
-
-
-MSG_error_t MSG_main_liveness(xbt_automaton_t a, char *prgm)
-{
-  /* Clean IO before the run */
-  fflush(stdout);
-  fflush(stderr);
-
-  if (MC_IS_ENABLED) {
-    MC_modelcheck_liveness(a, prgm);
-  }
-  else {
+  if (MC_IS_ENABLED) { 
+    MC_do_the_modelcheck_for_real();
+  } else {
     SIMIX_run();
   }
   return MSG_OK;
@@ -174,7 +150,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");
 
@@ -193,6 +169,7 @@ MSG_error_t MSG_clean(void)
 
   SIMIX_clean();
 
+  xbt_swag_free(msg_global->vms);
   free(msg_global);
   msg_global = NULL;
 
@@ -200,7 +177,7 @@ MSG_error_t MSG_clean(void)
 }
 
 
-/** \ingroup msg_easier_life
+/** \ingroup msg_simulation
  * \brief A clock (in second).
  */
 XBT_INLINE double MSG_get_clock(void)