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

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index bdc7a87cb4..fbd7d09725 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -1,6 +1,6 @@
 /* 	$Id$	 */
 
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
+/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
    All rights reserved.                                          */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -17,14 +17,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
 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 char * 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_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);
   parse_code = SIMIX_get_registered_function(A_surfxml_process_function);
   xbt_assert1(parse_code, "Unknown function %s",A_surfxml_process_function);
   parse_argc = 0 ;
@@ -46,37 +46,44 @@ static void parse_argument(void)
 static void parse_process_finalize(void)
 {
   process_arg_t arg = NULL;
-  smx_process_t process = NULL;
+  void * 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->hostname = parse_host;
     arg->argc = parse_argc;
     arg->argv = parse_argv;
-    arg-> kill_time = kill_time;
+    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);
+	   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);
+
   }
   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);
-    }
+    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);
   }
 }
 
-/** \ingroup msg_easier_life
+/** 
  * \brief An application deployer.
  *
  * Creates the process described in \a file.
@@ -89,7 +96,6 @@ 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) 
 {
@@ -102,11 +108,11 @@ void SIMIX_launch_application(const char *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
  */
@@ -117,12 +123,13 @@ void SIMIX_function_register(const char *name,smx_process_code_t code)
   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)
 {