Move initialization somewhere else because people that do not use MSG_launch_applicat...

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@4103 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index aa7783a..296f0f1 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -32,9 +32,6 @@ void MSG_launch_application(const char *file)
 
   xbt_assert0(msg_global,
              "MSG_global_init_args has to be called before MSG_launch_application.");
-  SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
-  SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
-  SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
 
   SIMIX_launch_application(file);
 

diff --git a/src/msg/global.c b/src/msg/global.c
index 602ddc4..eb92d76 100644 (file)
--- a/src/msg/global.c
+++ b/src/msg/global.c
@@ -53,6 +53,10 @@ void MSG_global_init(int *argc, char **argv)
     msg_global->process_list = xbt_fifo_new();
     msg_global->max_channel = 0;
     msg_global->PID = 1;
+
+    SIMIX_function_register_process_create(_MSG_process_create_from_SIMIX);
+    SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
+    SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
   }
   return;
 }