X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae66e43b95b26467c1cb9df271e83f51d3d7147b..e487ef4538248f261ddb6e814357593df7646e33:/src/msg/deployment.c

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index 516834ee7f..aa70f94048 100644
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -1,12 +1,12 @@
 /*     $Id$      */
-  
+
 /* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
 /* Copyright (c) 2007 Bruno Donassolo.                                      */
 /* All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
-  
+
 #include "msg/private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
@@ -19,52 +19,58 @@
  * \param file a filename of a xml description of the application. This file 
  * follows this DTD :
  *
- *     \include surfxml.dtd
+ *     \include simgrid.dtd
  *
  * Here is a small example of such a platform 
  *
- *     \include small_deployment.xml
+ *     \include msg/masterslave/deployment_masterslave.xml
  *
  * Have a look in the directory examples/msg/ to have a bigger example.
  */
-void MSG_launch_application(const char *file) 
+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_launch_application(file);
+  xbt_assert0(msg_global,
+              "MSG_global_init_args has to be called before MSG_launch_application.");
+
+  SIMIX_launch_application(file);
 
-	return;
+  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, xbt_main_func_t code)
+{
+  SIMIX_function_register(name, code);
+  return;
+}
+
+/** \ingroup msg_easier_life
+ * \brief Registers a function as the default main function of agents.
+ *
+ * Registers a code function as being the default value. This function will get used by MSG_launch_application() when there is no registered function of the requested name in.
+ * \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_default(xbt_main_func_t code)
 {
-	SIMIX_function_register(name, code);
-	return;
+  SIMIX_function_register_default(code);
 }
 
 /** \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);
 }
-