X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d093eb0c576e2f7a1d6c7a707ee55026aca3915..bea6786798593b78e0d62a2308eacad3284d4537:/src/simix/smx_deployment.c

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index c109c89c5b..2ca297f52f 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -10,30 +10,35 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/dict.h"
 #include "surf/surfxml_parse_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
 				"Logging specific to SIMIX (deployment)");
-static int parse_argc = -1 ;
+static int parse_argc = -1;
 static char **parse_argv = NULL;
-static smx_process_code_t parse_code = NULL;
-static char * parse_host = NULL;
+static xbt_main_func_t parse_code = NULL;
+static char *parse_host = NULL;
 static double start_time = 0.0;
 static double kill_time = -1.0;
-  
+
 static void parse_process_init(void)
 {
   parse_host = xbt_strdup(A_surfxml_process_host);
-  xbt_assert1(SIMIX_host_get_by_name(A_surfxml_process_host), "Unknown host %s",A_surfxml_process_host);
+  xbt_assert1(SIMIX_host_get_by_name(parse_host),
+	      "Unknown host %s", parse_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 ;
+  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);
+  surf_parse_get_double(&start_time, A_surfxml_process_start_time);
+  surf_parse_get_double(&kill_time, A_surfxml_process_kill_time);
+
+  current_property_set = xbt_dict_new();
 }
 
 static void parse_argument(void)
@@ -45,10 +50,10 @@ static void parse_argument(void)
 
 static void parse_process_finalize(void)
 {
-  process_arg_t arg = NULL;
-  void * process = NULL;
-  if(start_time>SIMIX_get_clock()) {
-    arg = xbt_new0(s_process_arg_t,1);
+  smx_process_arg_t arg = NULL;
+  void *process = NULL;
+  if (start_time > SIMIX_get_clock()) {
+    arg = xbt_new0(s_smx_process_arg_t, 1);
     arg->name = parse_argv[0];
     arg->code = parse_code;
     arg->data = NULL;
@@ -56,34 +61,50 @@ static void parse_process_finalize(void)
     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->hostname,start_time);
-		 if (simix_global->create_process_function)
-			 surf_timer_resource->extension_public->set(start_time, (void*) simix_global->create_process_function, arg);
-		 else
-			 surf_timer_resource->extension_public->set(start_time, (void*) &SIMIX_process_create_with_arguments, arg);
+    arg->properties = current_property_set;
+
+    DEBUG3("Process %s(%s) will be started at time %f", arg->name,
+	   arg->hostname, start_time);
+    if (simix_global->create_process_function)
+      surf_timer_model->extension_public->set(start_time,
+						 (void *) simix_global->
+						 create_process_function,
+						 arg);
+    else
+      surf_timer_model->extension_public->set(start_time, (void *)
+						 &SIMIX_process_create,
+						 arg);
 
   }
-  if((start_time<0) || (start_time==SIMIX_get_clock())) {
+  if ((start_time < 0) || (start_time == SIMIX_get_clock())) {
     DEBUG2("Starting Process %s(%s) right now", parse_argv[0], parse_host);
 
-		if (simix_global->create_process_function)
-			process = simix_global->create_process_function(parse_argv[0], parse_code, NULL, parse_host,	parse_argc,parse_argv);
-		else
-			process = SIMIX_process_create_with_arguments(parse_argv[0], parse_code, NULL, parse_host,	parse_argc,parse_argv, NULL);
-
-		if(kill_time > SIMIX_get_clock()) {
-			if (simix_global->kill_process_function)
-				surf_timer_resource->extension_public->set(start_time, (void*) simix_global->kill_process_function, arg);
-			else
-				surf_timer_resource->extension_public->set(kill_time, (void*) &SIMIX_process_kill, (void*) process);
-		}
-		xbt_free(parse_host);
+    if (simix_global->create_process_function)
+      process =
+	 (*simix_global->create_process_function)(parse_argv[0], parse_code,
+						NULL, parse_host,
+						parse_argc, parse_argv, /*the props*/ current_property_set);
+    else
+      process =
+	  SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host,
+			       parse_argc, parse_argv, /*the props*/ current_property_set);
+
+    if (kill_time > SIMIX_get_clock()) {
+      if (simix_global->kill_process_function)
+	surf_timer_model->extension_public->set(start_time,
+						   (void *) simix_global->
+						   kill_process_function,
+						   arg);
+      else
+	surf_timer_model->extension_public->set(kill_time, (void *)
+						   &SIMIX_process_kill,
+						   (void *) process);
+    }
+    xbt_free(parse_host);
   }
 }
 
-/** \ingroup msg_easier_life
+/** 
  * \brief An application deployer.
  *
  * Creates the process described in \a file.
@@ -96,49 +117,50 @@ static void parse_process_finalize(void)
  *
  *     \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_assert0(simix_global,
+	      "SIMIX_global_init has to be called before SIMIX_launch_application.");
+  surf_parse_reset_parser();
+  surfxml_add_callback(STag_surfxml_process_cb_list, parse_process_init);
+  surfxml_add_callback(ETag_surfxml_argument_cb_list, parse_argument);
+  surfxml_add_callback(STag_surfxml_prop_cb_list, parse_properties);
+  surfxml_add_callback(ETag_surfxml_process_cb_list, parse_process_finalize);
+
   surf_parse_open(file);
-  xbt_assert1((!surf_parse()),"Parse error in %s",file);
+  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 #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. 
+ * 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)
+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_assert0(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.
+/**
+ * \brief Gets a #smx_process_t code from the global table.
  *
- * Registers a code function in a global table. 
- * This table is then used by #MSG_launch_application. 
+ * 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.
  */
-smx_process_code_t SIMIX_get_registered_function(const char *name)
+xbt_main_func_t SIMIX_get_registered_function(const char *name)
 {
-  smx_process_code_t code = NULL;
-
-  xbt_assert0(simix_global,"SIMIX_global_init has to be called before SIMIX_get_registered_function.");
+  xbt_assert0(simix_global,
+	      "SIMIX_global_init has to be called before SIMIX_get_registered_function.");
 
-  code = xbt_dict_get_or_null(simix_global->registered_functions,name);
-
-  return code;
+  return xbt_dict_get_or_null(simix_global->registered_functions, name);
 }
-