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

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index b5d903bb51..fadf887a22 100644
--- 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,25 +15,23 @@
  * \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_from_SIMIX);
-	SIMIX_function_register_process_cleanup(__MSG_process_cleanup);
-	SIMIX_function_register_process_kill(_MSG_process_kill_from_SIMIX);
-   
-	SIMIX_launch_application(file);
+  xbt_assert(msg_global,
+              "MSG_global_init_args has to be called before MSG_launch_application.");
 
-	return;
+  SIMIX_launch_application(file);
+
+  return;
 }
 
 /** \ingroup msg_easier_life
@@ -48,10 +42,21 @@ void MSG_launch_application(const char *file)
  * \param name the reference name of 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)
+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_default(xbt_main_func_t code)
 {
-	SIMIX_function_register(name, code);
-	return;
+  SIMIX_function_register_default(code);
 }
 
 /** \ingroup msg_easier_life
@@ -66,3 +71,12 @@ xbt_main_func_t MSG_get_registered_function(const char *name)
   return SIMIX_get_registered_function(name);
 }
 
+/**
+ * \brief register functions bypassing the parser
+ */
+
+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);
+}