Remove unused include "simgrid_config.h"

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

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index 516834e..29e5235 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -1,17 +1,13 @@
-/*     $Id$      */
-  
-/* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
-/* Copyright (c) 2007 Bruno Donassolo.                                      */
-/* All rights reserved.                                                     */
+/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * 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"
 
-
 /** \ingroup msg_easier_life
  * \brief An application deployer.
  *
@@ -19,52 +15,68 @@
  * \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.");
 
-       return;
+  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;
+  SIMIX_function_register(name, code);
+  return;
 }
 
 /** \ingroup msg_easier_life
- * \brief Registers a #m_process_t code in a global table.
+ * \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_default(xbt_main_func_t code)
+{
+  SIMIX_function_register_default(code);
+}
+
+/** \ingroup msg_easier_life
+ * \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;
+  return SIMIX_get_registered_function(name);
+}
 
-       code = (m_process_code_t)SIMIX_get_registered_function(name);
+/**
+ * \brief register functions bypassing the parser
+ */
 
-  return code;
+void MSG_set_function(const char *host_id, const char *function_name,
+                      xbt_dynar_t arguments)
+{
+  SIMIX_process_set_function(host_id, function_name, arguments, -1, -1);
 }
-