Deprecate functions MSG_global_init() / MSG_global_init_args() in flavor of MSG_init()

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

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index c305f4e..243057c 100644 (file)
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -11,7 +11,9 @@
 #include "xbt/log.h"
 #include "xbt/virtu.h"
 #include "xbt/ex.h"             /* ex_backtrace_display */
 #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,
                                 "Logging specific to MSG (kernel)");
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_kernel, msg,
                                 "Logging specific to MSG (kernel)");
 


@@ -19,36 +21,19 @@ MSG_Global_t msg_global = NULL;
 
 /********************************* MSG **************************************/
 
 
 /********************************* MSG **************************************/
 

-/** \ingroup msg_simulation
- * \brief Initialize some MSG internal data.
+/* @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);
-}
-
-
-XBT_LOG_EXTERNAL_CATEGORY(msg_gos);
-XBT_LOG_EXTERNAL_CATEGORY(msg_kernel);
-XBT_LOG_EXTERNAL_CATEGORY(msg_mailbox);
-XBT_LOG_EXTERNAL_CATEGORY(msg_process);
+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) {
 #ifdef HAVE_TRACING
   TRACE_global_init(argc, argv);
 #endif
 
   xbt_getpid = MSG_process_self_PID;
   if (!msg_global) {

-    /* Connect our log channels: that must be done manually under windows */
-    XBT_LOG_CONNECT(msg_gos, msg);
-    XBT_LOG_CONNECT(msg_kernel, msg);
-    XBT_LOG_CONNECT(msg_mailbox, msg);
-    XBT_LOG_CONNECT(msg_process, msg);
+    s_msg_vm_t vm; // to compute the offset

 
     SIMIX_global_init(argc, argv);
 
 
     SIMIX_global_init(argc, argv);
 


@@ -61,6 +46,7 @@ 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->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();
 
     /* initialization of the action module */
     _MSG_action_init();


@@ -147,14 +133,14 @@ MSG_error_t MSG_main_stateful(void)
 }
 
 
 }
 
 

-MSG_error_t MSG_main_liveness(xbt_automaton_t a, char *prgm)
+MSG_error_t MSG_main_liveness(xbt_automaton_t a)

 {
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
 
   if (MC_IS_ENABLED) {
 {
   /* Clean IO before the run */
   fflush(stdout);
   fflush(stderr);
 
   if (MC_IS_ENABLED) {

-    MC_modelcheck_liveness(a, prgm);
+    MC_modelcheck_liveness(a);

   }
   else {
     SIMIX_run();
   }
   else {
     SIMIX_run();


@@ -204,6 +190,7 @@ MSG_error_t MSG_clean(void)
 
   SIMIX_clean();
 
 
   SIMIX_clean();
 

+  xbt_swag_free(msg_global->vms);

   free(msg_global);
   msg_global = NULL;
 
   free(msg_global);
   msg_global = NULL;
 


@@ -211,7 +198,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)
  * \brief A clock (in second).
  */
 XBT_INLINE double MSG_get_clock(void)