X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..9c1bc911d15a70898c862abf50907806010609a2:/src/simix/smx_deployment.cpp

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 422f0a86d4..d4825df8e1 100644
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -3,97 +3,38 @@
 /* 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. */
 
-#include "simgrid/Exception.hpp"
 #include "simgrid/s4u/Host.hpp"
 #include "smx_private.hpp"
 #include "src/surf/xml/platf_private.hpp" // FIXME: KILLME. There must be a better way than mimicking XML here
 #include <simgrid/engine.h>
+#include <simgrid/s4u/Engine.hpp>
 
 #include <string>
 #include <vector>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
 
-extern int surf_parse_lineno;
-
-void SIMIX_init_application()
+void SIMIX_init_application() // XBT_DEPRECATED_v329
 {
   sg_platf_exit();
   sg_platf_init();
 }
 
-/**
- * @brief An application deployer.
- *
- * Creates the process described in @a file.
- * @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
- *
- */
-void SIMIX_launch_application(const std::string& file)
-{
-  XBT_ATTRIB_UNUSED int parse_status;
-  xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
-
-  SIMIX_init_application();
-
-  surf_parse_open(file);
-  try {
-    parse_status = surf_parse();
-    surf_parse_close();
-    xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
-  } catch (const simgrid::Exception&) {
-    XBT_ERROR(
-        "Unrecoverable error at %s:%d. The full exception stack follows, in case it helps you to diagnose the problem.",
-        file.c_str(), surf_parse_lineno);
-    throw;
-  }
-}
-
-// Wrap a main() function into a ActorCodeFactory:
-static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
+void SIMIX_launch_application(const std::string& file) // XBT_DEPRECATED_v329
 {
-  return [code](std::vector<std::string> args) { return simgrid::xbt::wrap_main(code, std::move(args)); };
+  simgrid_load_deployment(file.c_str());
 }
-static simgrid::simix::ActorCodeFactory toActorCodeFactory(void (*code)(std::vector<std::string>))
+void SIMIX_function_register(const std::string& name, xbt_main_func_t code) // XBT_DEPRECATED_v329
 {
-  return [code](std::vector<std::string> args) { return std::bind(std::move(code), std::move(args)); };
+  simgrid::s4u::Engine::get_instance()->register_function(name, code);
 }
-
-/**
- * @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 std::string& name, xbt_main_func_t code)
+void SIMIX_function_register(const std::string& name, void (*code)(std::vector<std::string>)) // XBT_DEPRECATED_v329
 {
-  simix_global->registered_functions[name] = toActorCodeFactory(code);
+  simgrid::s4u::Engine::get_instance()->register_function(name, code);
 }
-void SIMIX_function_register(const std::string& name, void (*code)(std::vector<std::string>))
-{
-  simix_global->registered_functions[name] = toActorCodeFactory(code);
-}
-
-/**
- * @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)
+void SIMIX_function_register_default(xbt_main_func_t code) // XBT_DEPRECATED_v329
 {
-  xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_function_register.");
-  simix_global->default_function = toActorCodeFactory(code);
+  simgrid::s4u::Engine::get_instance()->register_default(code);
 }
 
 /**
@@ -119,11 +60,11 @@ simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const std::string
 /** @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)
+                                double process_start_time, double process_kill_time) // XBT_ATTRIB_DEPRECATED_v329
 {
   simgrid::kernel::routing::ActorCreationArgs actor;
 
-  sg_host_t host = sg_host_by_name(process_host);
+  const simgrid::s4u::Host* host = sg_host_by_name(process_host);
   if (not host)
     throw std::invalid_argument(simgrid::xbt::string_printf("Host '%s' unknown", process_host));
   actor.host = process_host;
@@ -136,14 +77,14 @@ void SIMIX_process_set_function(const char* process_host, const char* process_fu
   }
 
   // Check we know how to handle this function name:
-  simgrid::simix::ActorCodeFactory& parse_code = SIMIX_get_actor_code_factory(process_function);
+  const simgrid::simix::ActorCodeFactory& parse_code = SIMIX_get_actor_code_factory(process_function);
   xbt_assert(parse_code, "Function '%s' unknown", process_function);
 
-  actor.function   = process_function;
-  actor.host       = process_host;
-  actor.kill_time  = process_kill_time;
-  actor.start_time = process_start_time;
-  actor.on_failure = simgrid::kernel::routing::ActorOnFailure::DIE;
+  actor.function           = process_function;
+  actor.host               = process_host;
+  actor.kill_time          = process_kill_time;
+  actor.start_time         = process_start_time;
+  actor.restart_on_failure = false;
   sg_platf_new_actor(&actor);
 }