X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/87dcbdd62cdd688ee0d9cefc7ae54854148ec5fb..7ad85b03568dabade546f7948aaf7279059e9269:/src/simix/smx_deployment.c

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index dd0680734b..97f4bb4d1c 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -1,137 +1,146 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007, 2009-2015. 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 "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
-#include "surf/surfxml_parse_private.h"
+#include "xbt/dict.h"
+#include "surf/surfxml_parse.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
-				"Logging specific to SIMIX (deployment)");
-static int parse_argc = -1 ;
-static char **parse_argv = NULL;
-static smx_process_code_t parse_code = NULL;
-static smx_host_t parse_host = NULL;
-static double start_time = 0.0;
-static double kill_time = -1.0;
-  
-static void parse_process_init(void)
-{
-  parse_host = SIMIX_get_host_by_name(A_surfxml_process_host);
-  xbt_assert1(parse_host, "Unknown host %s",A_surfxml_process_host);
-  parse_code = SIMIX_get_registered_function(A_surfxml_process_function);
-  xbt_assert1(parse_code, "Unknown function %s",A_surfxml_process_function);
-  parse_argc = 0 ;
-  parse_argv = NULL;
-  parse_argc++;
-  parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
-  parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_process_function);
-  surf_parse_get_double(&start_time,A_surfxml_process_start_time);
-  surf_parse_get_double(&kill_time,A_surfxml_process_kill_time);
-}
+                                "Logging specific to SIMIX (deployment)");
 
-static void parse_argument(void)
-{
-  parse_argc++;
-  parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
-  parse_argv[(parse_argc) - 1] = xbt_strdup(A_surfxml_argument_value);
-}
+extern int surf_parse_lineno;
 
-static void parse_process_finalize(void)
+void SIMIX_init_application(void)
 {
-  process_arg_t arg = NULL;
-  smx_process_t process = NULL;
-  if(start_time>SIMIX_get_clock()) {
-    arg = xbt_new0(s_process_arg_t,1);
-    arg->name = parse_argv[0];
-    arg->code = parse_code;
-    arg->data = NULL;
-    arg->host = parse_host;
-    arg->argc = parse_argc;
-    arg->argv = parse_argv;
-    arg->kill_time = kill_time;
-
-    DEBUG3("Process %s(%s) will be started at time %f", arg->name, 
-	   arg->host->name,start_time);
-    surf_timer_resource->extension_public->set(start_time, (void*) &SIMIX_process_create_with_arguments,
-					       arg);
-  }
-  if((start_time<0) || (start_time==SIMIX_get_clock())) {
-    DEBUG2("Starting Process %s(%s) right now", parse_argv[0],
-	   parse_host->name);
-    process = SIMIX_process_create_with_arguments(parse_argv[0], parse_code, 
-						NULL, parse_host,
-						parse_argc,parse_argv);
-    if(kill_time > SIMIX_get_clock()) {
-      surf_timer_resource->extension_public->set(kill_time, 
-						 (void*) &SIMIX_process_kill,
-						 (void*) process);
-    }
-  }
+  surf_parse_reset_callbacks();
 }
 
-/** \ingroup msg_easier_life
+/**
  * \brief An application deployer.
  *
  * Creates the process described in \a file.
- * \param file a filename of a xml description of the application. This file 
+ * \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 
+ * 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 SIMIX_launch_application(const char *file) 
+void SIMIX_launch_application(const char *file)
 {
-  xbt_assert0(simix_global,"SIMIX_global_init_args has to be called before SIMIX_launch_application.");
-  STag_surfxml_process_fun = parse_process_init;
-  ETag_surfxml_argument_fun = parse_argument;
-  ETag_surfxml_process_fun = parse_process_finalize;
+  XBT_ATTRIB_UNUSED int parse_status;
+  xbt_assert(simix_global,
+              "SIMIX_global_init has to be called before SIMIX_launch_application.");
+
+  SIMIX_init_application();
+
   surf_parse_open(file);
-  xbt_assert1((!surf_parse()),"Parse error in %s",file);
-  surf_parse_close();
+  TRY {
+    parse_status = surf_parse();
+    surf_parse_close();
+    xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno);
+  }
+  CATCH_ANONYMOUS {
+    XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
+        file, surf_parse_lineno);
+    RETHROW;
+  }
 }
 
-/** \ingroup msg_easier_life
- * \brief Registers a #m_process_code_t code in a global table.
+/**
+ * \brief Registers a #smx_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. 
+ * Registers a code function in a global table.
+ * This table is then used by #SIMIX_launch_application.
  * \param name the reference name of the function.
  * \param code the function
  */
-void SIMIX_function_register(const char *name,smx_process_code_t code)
+XBT_INLINE void SIMIX_function_register(const char *name,
+                                        xbt_main_func_t code)
 {
-  xbt_assert0(simix_global,"SIMIX_global_init has to be called before SIMIX_function_register.");
+  xbt_assert(simix_global,
+              "SIMIX_global_init has to be called before SIMIX_function_register.");
 
-  xbt_dict_set(simix_global->registered_functions,name,code,NULL);
+  xbt_dict_set(simix_global->registered_functions, name, code, NULL);
 }
 
-/** \ingroup msg_easier_life
- * \brief Registers a #m_process_t code in a global table.
+static xbt_main_func_t default_function = NULL;
+/**
+ * \brief Registers a #smx_process_code_t code as default value.
  *
- * 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.
+ * Registers a code function as being the default value. This function will get used by SIMIX_launch_application() when there is no registered function of the requested name in.
+ * \param code the function
  */
-smx_process_code_t SIMIX_get_registered_function(const char *name)
+void SIMIX_function_register_default(xbt_main_func_t code)
 {
-  smx_process_code_t code = NULL;
+  xbt_assert(simix_global,
+              "SIMIX_global_init has to be called before SIMIX_function_register.");
 
-  xbt_assert0(simix_global,"SIMIX_global_init has to be called before SIMIX_get_registered_function.");
+  default_function = code;
+}
 
-  code = xbt_dict_get_or_null(simix_global->registered_functions,name);
+/**
+ * \brief Gets a #smx_process_t code from the global table.
+ *
+ * Gets a code function from the global table. Returns NULL if there are no function registered with the name.
+ * This table is then used by #SIMIX_launch_application.
+ * \param name the reference name of the function.
+ * \return The #smx_process_t or NULL.
+ */
+xbt_main_func_t SIMIX_get_registered_function(const char *name)
+{
+  xbt_main_func_t res = NULL;
+  xbt_assert(simix_global,
+              "SIMIX_global_init has to be called before SIMIX_get_registered_function.");
 
-  return code;
+  res = (xbt_main_func_t)xbt_dict_get_or_null(simix_global->registered_functions, name);
+  return res ? res : default_function;
 }
 
+
+/**
+ * \brief Bypass the parser, get arguments, and set function to each process
+ */
+
+void SIMIX_process_set_function(const char *process_host,
+                                const char *process_function,
+                                xbt_dynar_t arguments,
+                                double process_start_time,
+                                double process_kill_time)
+{
+  s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER;
+
+  sg_host_t host = sg_host_by_name(process_host);
+  if (!host)
+    THROWF(arg_error, 0, "Host '%s' unknown", process_host);
+  process.host = sg_host_get_name(host);
+
+  process.argc = 1 + xbt_dynar_length(arguments);
+  process.argv = (const char**)xbt_new(char *, process.argc + 1);
+  process.argv[0] = xbt_strdup(process_function);
+  /* add arguments */
+  unsigned int i;
+  char *arg;
+  xbt_dynar_foreach(arguments, i, arg) {
+    process.argv[i + 1] = xbt_strdup(arg);
+  }
+  process.argv[process.argc] = NULL;
+
+  xbt_main_func_t parse_code = SIMIX_get_registered_function(process_function);
+  xbt_assert(parse_code, "Function '%s' unknown", process_function);
+  process.function = process_function;
+
+  process.host = process_host;
+  process.kill_time = process_kill_time;
+  process.start_time = process_start_time;
+
+  sg_platf_new_process(&process);
+}