New directory hierarchy with make check working.

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

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index 516834e..b5d903b 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -31,40 +31,38 @@ 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_with_arguments);
-       SIMIX_function_register_process_kill(&MSG_process_kill);
+       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);
 
        return;
 }
 
 /** \ingroup msg_easier_life
- * \brief Registers a #m_process_code_t code in a global table.
+ * \brief Registers the main function of an agent in a global table.
  *
  * Registers a code function in a global table. 
  * This table is then used by #MSG_launch_application. 
  * \param name the reference name of the function.
- * \param code the function
+ * \param code the function (must have the same prototype than the main function of any C program: int ..(int argc, char *argv[]))
  */
-void MSG_function_register(const char *name,m_process_code_t code)
+void MSG_function_register(const char *name,xbt_main_func_t code)
 {
        SIMIX_function_register(name, code);
        return;
 }
 
 /** \ingroup msg_easier_life
- * \brief Registers a #m_process_t code in a global table.
+ * \brief Retrieves a registered main function
  *
  * Registers a code function in a global table. 
  * This table is then used by #MSG_launch_application. 
  * \param name the reference name of the function.
  */
-m_process_code_t MSG_get_registered_function(const char *name)
+xbt_main_func_t MSG_get_registered_function(const char *name)
 {
-  m_process_code_t code = NULL;
-
-       code = (m_process_code_t)SIMIX_get_registered_function(name);
-
-  return code;
+  return SIMIX_get_registered_function(name);
 }