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

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 622aeb85ab..54ae08af2a 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,8 +71,7 @@ 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)
@@ -87,14 +84,18 @@ static void parse_process_finalize(void)
     else
       process = SIMIX_process_create(parse_argv[0], parse_code, NULL, parse_host, parse_argc, parse_argv,       /*the props */
                                      current_property_set);
-
-    if (process && kill_time > SIMIX_get_clock()) {
-      if (simix_global->kill_process_function)
-        surf_timer_model->extension.timer.set(start_time, (void *)
+    /* 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;
+    }
+    if (kill_time > SIMIX_get_clock()) {
+    	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);
     }
@@ -139,7 +140,7 @@ void SIMIX_launch_application(const char *file)
  * \param name the reference name of the function.
  * \param code the function
  */
-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.");