[sonar] Add const qualifier for reference parameter.

[simgrid.git] / src / s4u / s4u_Engine.cpp

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index c4ecd81..c773d0e 100644 (file)
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -42,7 +42,7 @@ Engine* Engine::instance_ = nullptr; /* That singleton is awful, but I don't see
 Engine::Engine(int* argc, char** argv) : pimpl(new kernel::EngineImpl())
 {
   xbt_assert(Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
-  TRACE_global_init();
+  instr::init();
   SIMIX_global_init(argc, argv);
 
   Engine::instance_ = this;
@@ -93,7 +93,10 @@ void Engine::load_platform(const std::string& platf)
 
 void Engine::register_function(const std::string& name, int (*code)(int, char**)) // deprecated
 {
-  register_function(name, [code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+  kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+    return xbt::wrap_main(code, std::move(args));
+  };
+  register_function(name, std::move(code_factory));
 }
 void Engine::register_default(int (*code)(int, char**)) // deprecated
 {
@@ -101,23 +104,28 @@ void Engine::register_default(int (*code)(int, char**)) // deprecated
 }
 
 /** Registers the main function of an actor that will be launched from the deployment file */
-void Engine::register_function(const std::string& name, void (*code)(int, char**))
+void Engine::register_function(const std::string& name, const std::function<void(int, char**)>& code)
 {
-  register_function(name, [code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
+  kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+    return xbt::wrap_main(code, std::move(args));
+  };
+  register_function(name, std::move(code_factory));
 }
 
 /** Registers the main function of an actor that will be launched from the deployment file */
-void Engine::register_function(const std::string& name, void (*code)(std::vector<std::string>))
+void Engine::register_function(const std::string& name, const std::function<void(std::vector<std::string>)>& code)
 {
-  register_function(name,
-                    [code](std::vector<std::string> args) { return std::bind(std::move(code), std::move(args)); });
+  kernel::actor::ActorCodeFactory code_factory = [code](std::vector<std::string> args) {
+    return std::bind(std::move(code), std::move(args));
+  };
+  register_function(name, std::move(code_factory));
 }
 /** Registers a function as the default main function of actors
  *
  * It will be used as fallback when the function requested from the deployment file was not registered.
  * It is used for trace-based simulations (see examples/s4u/replay-comms and similar).
  */
-void Engine::register_default(void (*code)(int, char**))
+void Engine::register_default(const std::function<void(int, char**)>& code)
 {
   register_default([code](std::vector<std::string> args) { return xbt::wrap_main(code, std::move(args)); });
 }
@@ -413,7 +421,7 @@ void Engine::set_config(const std::string& name, bool value)
 {
   config::set_value(name.c_str(), value);
 }
-void Engine::set_config(const std::string& name, std::string value)
+void Engine::set_config(const std::string& name, const std::string& value)
 {
   config::set_value(name.c_str(), value);
 }
@@ -451,7 +459,8 @@ double simgrid_get_clock()
 {
   return simgrid::s4u::Engine::get_clock();
 }
-int simgrid_get_actor_count()
+
+int simgrid_get_actor_count() // XBT_ATTRIB_DEPRECATED_v330
 {
   return simgrid::s4u::Engine::get_instance()->get_actor_count();
 }