moving include/surf to src/include/surf (continued)

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

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index 9874ee1..4f61e3a 100644 (file)
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -12,9 +12,6 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(deployment, msg,
                                "Logging specific to MSG (environment)");
 
-extern char *yytext;
-
-
 static int parse_argc = -1 ;
 static char **parse_argv = NULL;
 static m_process_code_t parse_code = NULL;
@@ -50,47 +47,55 @@ static void parse_process_finalize(void)
  * \brief An application deployer.
  *
  * Creates the process described in \a file.
- * @param file a file containing an XML description of the application.
+ * \param file a filename of a xml description of the application. This file 
+ * follows this DTD :
+ *
+ *     \include surfxml.dtd
+ *
+ * Here is a small example of such a platform 
+ *
+ *     \include small_deployment.xml
+ *
+ * Have a look in the directory examples/msg/ to have a bigger example.
  */
 void MSG_launch_application(const char *file) 
 {
-  MSG_global_init();
-  surf_parse_reset_parser();
+  xbt_assert0(msg_global,"MSG_global_init_args has to be called before MSG_launch_application.");
   STag_process_fun = parse_process_init;
   ETag_argument_fun = parse_argument;
   ETag_process_fun = parse_process_finalize;
   surf_parse_open(file);
-  surf_parse_lex();
+  xbt_assert1((!surf_parse()),"Parse error in %s",file);
   surf_parse_close();
 }
 
 /** \ingroup msg_easier_life
- * \brief Registers a ::m_process_code_t code in a global table.
+ * \brief Registers a #m_process_code_t code in a global table.
  *
  * Registers a code function in a global table. 
- * This table is then used by ::MSG_launch_application. 
+ * This table is then used by #MSG_launch_application. 
  * \param name the reference name of the function.
  * \param code the function
  */
 void MSG_function_register(const char *name,m_process_code_t code)
 {
-  MSG_global_init();
+  xbt_assert0(msg_global,"MSG_global_init_args has to be called before MSG_function_register.");
 
   xbt_dict_set(msg_global->registered_functions,name,code,NULL);
 }
 
 /** \ingroup msg_easier_life
- * \brief Registers a ::m_process_t code in a global table.
+ * \brief Registers a #m_process_t code in a global table.
  *
  * Registers a code function in a global table. 
- * This table is then used by ::MSG_launch_application. 
+ * 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)
 {
   m_process_code_t code = NULL;
 
-  MSG_global_init();
+  xbt_assert0(msg_global,"MSG_global_init_args has to be called before MSG_get_registered_function.");
  
   xbt_dict_get(msg_global->registered_functions,name,(void **) &code);
 
@@ -99,10 +104,10 @@ m_process_code_t MSG_get_registered_function(const char *name)
 
 /** \ingroup msg_easier_life
  * \brief Get the arguments of the current process.
- * \deprecated{Not useful since m_process_code_t is int (*)(int argc, char *argv[])}
+ * \deprecated{Not useful since #m_process_code_t is int (*)(int argc, char *argv[])}
  *
  * This functions returns the values set for the current process 
- * using ::MSG_set_arguments or ::MSG_launch_application.
+ * using #MSG_set_arguments or #MSG_launch_application.
  * \param argc the number of arguments
  * \param argv the arguments table
  */