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

diff --git a/src/simix/smx_deployment.c b/src/simix/smx_deployment.c
index 5cb246b375..97f4bb4d1c 100644
--- a/src/simix/smx_deployment.c
+++ b/src/simix/smx_deployment.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -13,67 +13,11 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
                                 "Logging specific to SIMIX (deployment)");
 
-static xbt_main_func_t parse_code = NULL;
-static double start_time = 0.0;
-static double kill_time = -1.0;
-
-static int auto_restart = 0;
-
 extern int surf_parse_lineno;
 
-static void parse_process(sg_platf_process_cbarg_t process)
+void SIMIX_init_application(void)
 {
-  smx_host_t host = SIMIX_host_get_by_name(process->host);
-  if (!host)
-    THROWF(arg_error, 0, "Host '%s' unknown", process->host);
-  parse_code = SIMIX_get_registered_function(process->function);
-  xbt_assert(parse_code, "Function '%s' unknown", process->function);
-
-  start_time = process->start_time;
-  kill_time  = process->kill_time;
-  auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1;
-
-  smx_process_arg_t arg = NULL;
-  smx_process_t process_created = NULL;
-
-  if (start_time > SIMIX_get_clock()) {
-    arg = xbt_new0(s_smx_process_arg_t, 1);
-    arg->name = (char*)(process->argv)[0];
-    arg->code = parse_code;
-    arg->data = NULL;
-    arg->hostname = host->name;
-    arg->argc = process->argc;
-    arg->argv = (char**)(process->argv);
-    arg->kill_time = kill_time;
-    arg->properties = current_property_set;
-
-    XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name,
-           arg->hostname, start_time);
-    SIMIX_timer_set(start_time, &SIMIX_process_create_from_wrapper, arg);
-  } else {                      // start_time <= SIMIX_get_clock()
-    XBT_DEBUG("Starting Process %s(%s) right now", process->argv[0], host->name);
-
-    if (simix_global->create_process_function)
-      simix_global->create_process_function(&process_created,
-                                            (char*)(process->argv)[0],
-                                            parse_code,
-                                            NULL,
-                                            host->name,
-                                            kill_time,
-                                            process->argc,
-                                            (char**)(process->argv),
-                                            current_property_set,
-                                            auto_restart);
-    else
-      simcall_process_create(&process_created, (char*)(process->argv)[0], parse_code, NULL, host->name, kill_time, process->argc,
-          (char**)process->argv, current_property_set,auto_restart);
-
-    /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */
-    if (!process_created) {
-      return;
-    }
-  }
-  current_property_set = NULL;
+  surf_parse_reset_callbacks();
 }
 
 /**
@@ -92,22 +36,19 @@ static void parse_process(sg_platf_process_cbarg_t process)
  */
 void SIMIX_launch_application(const char *file)
 {
-  xbt_ex_t e;
-
-  _XBT_GNUC_UNUSED int parse_status;
+  XBT_ATTRIB_UNUSED int parse_status;
   xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_launch_application.");
 
-  surf_parse_reset_callbacks();
-
-  sg_platf_process_add_cb(parse_process);
+  SIMIX_init_application();
 
   surf_parse_open(file);
   TRY {
     parse_status = surf_parse();
     surf_parse_close();
     xbt_assert(!parse_status, "Parse error at %s:%d", file,surf_parse_lineno);
-  } CATCH(e) {
+  }
+  CATCH_ANONYMOUS {
     XBT_ERROR("Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
         file, surf_parse_lineno);
     RETHROW;
@@ -175,13 +116,12 @@ void SIMIX_process_set_function(const char *process_host,
                                 double process_start_time,
                                 double process_kill_time)
 {
-  s_sg_platf_process_cbarg_t process;
-  memset(&process,0,sizeof(process));
+  s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER;
 
-  smx_host_t host = SIMIX_host_get_by_name(process_host);
+  sg_host_t host = sg_host_by_name(process_host);
   if (!host)
     THROWF(arg_error, 0, "Host '%s' unknown", process_host);
-  process.host = host->name;
+  process.host = sg_host_get_name(host);
 
   process.argc = 1 + xbt_dynar_length(arguments);
   process.argv = (const char**)xbt_new(char *, process.argc + 1);
@@ -194,15 +134,13 @@ void SIMIX_process_set_function(const char *process_host,
   }
   process.argv[process.argc] = NULL;
 
-  parse_code = SIMIX_get_registered_function(process_function);
+  xbt_main_func_t parse_code = SIMIX_get_registered_function(process_function);
   xbt_assert(parse_code, "Function '%s' unknown", process_function);
   process.function = process_function;
 
   process.host = process_host;
   process.kill_time = process_kill_time;
   process.start_time = process_start_time;
-  process.on_failure = SURF_PROCESS_ON_FAILURE_DIE;
-  process.properties = NULL;
 
   sg_platf_new_process(&process);
 }