X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a18fb7c6c81b1f58a9f8111fcf0ade106c4746b..8870e4a485d50ed72f249b345c8338dd6ef1b7f7:/src/msg/msg_global.c

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index 99240fd137..1cfcfa3ccf 100644
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -64,9 +64,13 @@ void MSG_global_init(int *argc, char **argv)
 
     msg_global = xbt_new0(s_MSG_Global_t, 1);
 
+#ifdef MSG_USE_DEPRECATED
     msg_global->max_channel = 0;
+#endif
     msg_global->PID = 1;
     msg_global->sent_msg = 0;
+    msg_global->task_copy_callback = NULL;
+    msg_global->process_data_cleanup = NULL;
 
     /* initialization of the action module */
     _MSG_action_init();
@@ -83,6 +87,7 @@ void MSG_global_init(int *argc, char **argv)
   MSG_HOST_LEVEL = xbt_lib_add_level(host_lib, (void_f_pvoid_t) __MSG_host_destroy);
 }
 
+#ifdef MSG_USE_DEPRECATED
 /** \defgroup m_channel_management    Understanding channels
  *  \brief This section briefly describes the channel notion of MSG
  *  (#m_channel_t).
@@ -110,6 +115,7 @@ void MSG_global_init(int *argc, char **argv)
  */
 MSG_error_t MSG_set_channel_number(int number)
 {
+  XBT_WARN("DEPRECATED! Now use alias");
   xbt_assert((msg_global)
               && (msg_global->max_channel == 0),
               "Channel number already set!");
@@ -128,12 +134,14 @@ MSG_error_t MSG_set_channel_number(int number)
  */
 int MSG_get_channel_number(void)
 {
+  XBT_WARN("DEPRECATED! Now use alias");
   xbt_assert((msg_global)
               && (msg_global->max_channel != 0),
               "Channel number not set yet!");
 
   return msg_global->max_channel;
 }
+#endif
 
 /** \ingroup msg_simulation
  * \brief Launch the MSG simulation
@@ -168,29 +176,15 @@ MSG_error_t MSG_main_stateful(void)
   return MSG_OK;
 }
 
-MSG_error_t MSG_main_liveness_stateful(xbt_automaton_t a)
-{
-  /* Clean IO before the run */
-  fflush(stdout);
-  fflush(stderr);
-
-  if (MC_IS_ENABLED) {
-    MC_modelcheck_liveness_stateful(a);
-  }
-  else {
-    SIMIX_run();
-  }
-  return MSG_OK;
-}
 
-MSG_error_t MSG_main_liveness_stateless(xbt_automaton_t a, char *prgm)
+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_stateless(a, prgm);
+    MC_modelcheck_liveness(a, prgm);
   }
   else {
     SIMIX_run();
@@ -207,7 +201,7 @@ MSG_error_t MSG_main_liveness_stateless(xbt_automaton_t a, char *prgm)
  */
 int MSG_process_killall(int reset_PIDs)
 {
-  SIMIX_req_process_killall();
+  simcall_process_killall();
 
   if (reset_PIDs > 0) {
     msg_global->PID = reset_PIDs;