X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/217557096673710f29ebe590ffcf76329ddd87de..656d24a575ca26a64c94174ff3573272979e081d:/src/simix/smx_deployment.cpp

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 1b7be72fb5..4edcc9d396 100644
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -8,7 +8,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/dict.h"
-#include "surf/surfxml_parse.h"
+#include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix,
                                 "Logging specific to SIMIX (deployment)");
@@ -17,7 +17,8 @@ extern int surf_parse_lineno;
 
 void SIMIX_init_application(void)
 {
-  surf_parse_reset_callbacks();
+  sg_platf_exit();
+  sg_platf_init();
 }
 
 /**
@@ -56,32 +57,29 @@ void SIMIX_launch_application(const char *file)
 }
 
 /**
- * \brief Registers a #smx_process_code_t code in a global table.
+ * \brief Registers a #xbt_main_func_t code in a global table.
  *
  * Registers a code function in a global table.
  * This table is then used by #SIMIX_launch_application.
  * \param name the reference name of the function.
  * \param code the function
  */
-void SIMIX_function_register(const char *name,
-                                        xbt_main_func_t code)
+void SIMIX_function_register(const char *name, xbt_main_func_t code)
 {
-  xbt_assert(simix_global,
-              "SIMIX_global_init has to be called before SIMIX_function_register."); 
+  xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register.");
   xbt_dict_set(simix_global->registered_functions, name, (void*) code, NULL);
 }
 
 static xbt_main_func_t default_function = NULL;
 /**
- * \brief Registers a #smx_process_code_t code as default value.
+ * \brief Registers a #xbt_main_func_t code as default value.
  *
  * Registers a code function as being the default value. This function will get used by SIMIX_launch_application() when there is no registered function of the requested name in.
  * \param code the function
  */
 void SIMIX_function_register_default(xbt_main_func_t code)
 {
-  xbt_assert(simix_global,
-              "SIMIX_global_init has to be called before SIMIX_function_register.");
+  xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register.");
 
   default_function = code;
 }
@@ -115,7 +113,8 @@ void SIMIX_process_set_function(const char *process_host,
                                 double process_start_time,
                                 double process_kill_time)
 {
-  s_sg_platf_process_cbarg_t process = SG_PLATF_PROCESS_INITIALIZER;
+  s_sg_platf_process_cbarg_t process;
+  memset(&process,0,sizeof(process));
 
   sg_host_t host = sg_host_by_name(process_host);
   if (!host)
@@ -140,6 +139,7 @@ void SIMIX_process_set_function(const char *process_host,
   process.host = process_host;
   process.kill_time = process_kill_time;
   process.start_time = process_start_time;
+  process.on_failure = SURF_PROCESS_ON_FAILURE_DIE;
 
   sg_platf_new_process(&process);
 }