X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b757886241c3fc8c055842b3cf7fef7494031d7..86d47b5c39d2ac9583bda0f838757d531f8cfe94:/src/simix/smx_deployment.c

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 36a1a1da50..e97d5740b4 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -1,7 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007, 2009, 2010. 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. */
@@ -73,32 +71,32 @@ static void parse_process_finalize(void)
       surf_timer_model->extension.timer.set(start_time, (void *)
                                             &SIMIX_process_create, arg);
 
-  }
-  if ((start_time < 0) || (start_time == SIMIX_get_clock())) {
+  } else {                      // 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,
-                                                  /*the props */
-                                                  current_property_set);
+          (*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);
-    /* verify if process has been created */
+    /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
     if (!process) {
-    	xbt_free(parse_host);
-    	return;
+      xbt_free(parse_host);
+      return;
     }
     if (kill_time > SIMIX_get_clock()) {
-    	if (simix_global->kill_process_function)
-    		surf_timer_model->extension.timer.set(start_time, (void *)
+      if (simix_global->kill_process_function)
+        surf_timer_model->extension.timer.set(start_time, (void *)
                                               simix_global->kill_process_function,
                                               process);
-    	else
-    		surf_timer_model->extension.timer.set(kill_time, (void *)
+      else
+        surf_timer_model->extension.timer.set(kill_time, (void *)
                                               &SIMIX_process_kill,
                                               (void *) process);
     }
@@ -122,17 +120,20 @@ static void parse_process_finalize(void)
  */
 void SIMIX_launch_application(const char *file)
 {
+  int parse_status;
   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);
+  surfxml_add_callback(ETag_surfxml_process_cb_list,
+                       parse_process_finalize);
 
   surf_parse_open(file);
-  xbt_assert1((!surf_parse()), "Parse error in %s", file);
+  parse_status = surf_parse();
   surf_parse_close();
+  xbt_assert1(!parse_status, "Parse error in %s", file);
 }
 
 /**
@@ -143,7 +144,8 @@ void SIMIX_launch_application(const char *file)
  * \param name the reference name of the function.
  * \param code the function
  */
-XBT_INLINE void SIMIX_function_register(const char *name, xbt_main_func_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.");
@@ -176,10 +178,52 @@ void SIMIX_function_register_default(xbt_main_func_t code)
  */
 xbt_main_func_t SIMIX_get_registered_function(const char *name)
 {
+  xbt_main_func_t res = NULL;
   xbt_assert0(simix_global,
               "SIMIX_global_init has to be called before SIMIX_get_registered_function.");
 
-  xbt_main_func_t res =
-    xbt_dict_get_or_null(simix_global->registered_functions, name);
+  res = 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)
+{
+  unsigned int i;
+  char *arg;
+
+  /* init process */
+  parse_host = xbt_strdup(process_host);
+  xbt_assert1(SIMIX_host_get_by_name(parse_host),
+              "Host '%s' unknown", parse_host);
+  parse_code = SIMIX_get_registered_function(process_function);
+  xbt_assert1(parse_code, "Function '%s' unknown", 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(process_function);
+  start_time = process_start_time;
+  kill_time = process_kill_time;
+  current_property_set = xbt_dict_new();
+
+  /* add arguments */
+  xbt_dynar_foreach(arguments, i, arg) {
+    parse_argc++;
+    parse_argv = xbt_realloc(parse_argv, (parse_argc) * sizeof(char *));
+    parse_argv[(parse_argc) - 1] = xbt_strdup(arg);
+  }
+
+  /*finalize */
+  parse_process_finalize();
+
+}