deprecate some of simix.h C API

[simgrid.git] / src / simix / smx_deployment.cpp

diff --git a/src/simix/smx_deployment.cpp b/src/simix/smx_deployment.cpp
index 79a4993..d94d87f 100644 (file)
--- a/src/simix/smx_deployment.cpp
+++ b/src/simix/smx_deployment.cpp
@@ -9,6 +9,7 @@
 #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 <xbt/ex.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_deployment, simix, "Logging specific to SIMIX (deployment)");
@@ -35,7 +36,7 @@ void SIMIX_init_application()
  *     \include small_deployment.xml
  *
  */
-void SIMIX_launch_application(const char *file)
+void SIMIX_launch_application(std::string file)
 {
   XBT_ATTRIB_UNUSED int parse_status;
   xbt_assert(simix_global, "SIMIX_global_init has to be called before SIMIX_launch_application.");
@@ -46,15 +47,21 @@ void SIMIX_launch_application(const char *file)
   try {
     parse_status = surf_parse();
     surf_parse_close();
-    xbt_assert(not parse_status, "Parse error at %s:%d", file, surf_parse_lineno);
+    xbt_assert(not parse_status, "Parse error at %s:%d", file.c_str(), surf_parse_lineno);
   }
   catch (xbt_ex& e) {
-    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);
+    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;
   }
 }
 
+void SIMIX_launch_application(const char* file) // deprecated
+{
+  simgrid_load_deployment(file);
+}
+
 // Wrap a main() function into a ActorCodeFactory:
 static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
 {
@@ -69,13 +76,18 @@ static simgrid::simix::ActorCodeFactory toActorCodeFactory(xbt_main_func_t code)
  * \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(std::string name, xbt_main_func_t code)
 {
   xbt_assert(simix_global,
     "SIMIX_global_init has to be called before SIMIX_function_register.");
   simix_global->registered_functions[name] = toActorCodeFactory(code);
 }
 
+void SIMIX_function_register(const char* name, xbt_main_func_t code) // deprecated
+{
+  simgrid_register_function(name, code);
+}
+
 /**
  * \brief Registers a #xbt_main_func_t code as default value.
  *
@@ -96,7 +108,7 @@ void SIMIX_function_register_default(xbt_main_func_t code)
  * \param name the reference name of the function.
  * \return The #smx_actor_t or nullptr.
  */
-simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(const char *name)
+simgrid::simix::ActorCodeFactory& SIMIX_get_actor_code_factory(std::string name)
 {
   xbt_assert(simix_global,
               "SIMIX_global_init has to be called before SIMIX_get_actor_code_factory.");
@@ -144,7 +156,7 @@ void SIMIX_process_set_function(const char* process_host, const char* process_fu
 namespace simgrid {
 namespace simix {
 
-void register_function(const char* name, ActorCodeFactory factory)
+void register_function(std::string name, ActorCodeFactory factory)
 {
   simix_global->registered_functions[name] = std::move(factory);
 }