Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/msg/msg_global.c b/src/msg/msg_global.c
index b10d9c4..7b0c29e 100644 (file)
--- a/src/msg/msg_global.c
+++ b/src/msg/msg_global.c
@@ -68,6 +68,7 @@ void MSG_global_init(int *argc, char **argv)
     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();
@@ -111,6 +112,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!");
@@ -129,6 +131,7 @@ 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!");
@@ -194,7 +197,7 @@ MSG_error_t MSG_main_liveness(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;