X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b9103db7f7aac95d28b162b7f78c6a946bba864..937002db594a50d239dc6cebfb5c46c0ba7a5fd9:/src/msg/deployment.c

diff --git a/src/msg/deployment.c b/src/msg/deployment.c
index c160d98550..a69db56b90 100644
--- a/src/msg/deployment.c
+++ b/src/msg/deployment.c
@@ -12,14 +12,13 @@
 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;
 static m_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 = MSG_get_host_by_name(A_process_host);
@@ -31,6 +30,8 @@ static void parse_process_init(void)
   parse_argc++;
   parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
   parse_argv[(parse_argc) - 1] = xbt_strdup(A_process_function);
+  surf_parse_get_double(&start_time,A_process_start_time);
+  surf_parse_get_double(&kill_time,A_process_kill_time);
 }
 
 static void parse_argument(void)
@@ -42,15 +43,47 @@ static void parse_argument(void)
 
 static void parse_process_finalize(void)
 {
-  MSG_process_create_with_arguments(parse_argv[0], parse_code, NULL, parse_host,
-				    parse_argc,parse_argv);
+  process_arg_t arg = NULL;
+  m_process_t process = NULL;
+  if(start_time>MSG_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;
+
+    surf_timer_resource->extension_public->set(start_time, (void*) &MSG_process_create_with_arguments,
+					       arg);
+  }
+  if(start_time==MSG_get_clock()) {
+    process = MSG_process_create_with_arguments(parse_argv[0], parse_code, 
+						NULL, parse_host,
+						parse_argc,parse_argv);
+    if(kill_time > MSG_getClock()) {
+      surf_timer_resource->extension_public->set(kill_time, 
+						 (void*) &MSG_process_kill,
+						 (void*) process);
+    }
+  }
 }
 
 /** \ingroup msg_easier_life
  * \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) 
 {
@@ -64,10 +97,10 @@ void MSG_launch_application(const char *file)
 }
 
 /** \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
  */
@@ -79,10 +112,10 @@ void MSG_function_register(const char *name,m_process_code_t code)
 }
 
 /** \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)
@@ -98,10 +131,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
  */