Allow to register functions that are void (*code)(std::vector<std::string>)

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

diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index 42ec9d8..afdc16f 100644 (file)
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -80,6 +80,10 @@ void Engine::register_function(std::string name, int (*code)(int, char**))
 {
   SIMIX_function_register(name, code);
 }
+void Engine::register_function(std::string name, void (*code)(std::vector<std::string>))
+{
+  SIMIX_function_register(name, code);
+}
 void Engine::register_default(int (*code)(int, char**))
 {
   SIMIX_function_register_default(code);
@@ -139,7 +143,7 @@ void Engine::host_unregister(std::string name)
 simgrid::s4u::Host* Engine::host_by_name(std::string name)
 {
   if (pimpl->hosts_.find(name) == pimpl->hosts_.end())
-    throw std::invalid_argument(std::string("Host not found: ") + name);
+    throw std::invalid_argument(std::string("Host not found: '") + name + std::string("'"));
   return pimpl->hosts_.at(name);
 }
 
@@ -366,28 +370,32 @@ void Engine::set_config(std::string str)
 } // namespace simgrid
 
 /* **************************** Public C interface *************************** */
-void sg_engine_load_platform(const char* file)
+void simgrid_init(int* argc, char** argv)
+{
+  simgrid::s4u::Engine e(argc, argv);
+}
+void simgrid_load_platform(const char* file)
 {
   simgrid::s4u::Engine::get_instance()->load_platform(file);
 }
 
-void sg_engine_load_deployment(const char* file)
+void simgrid_load_deployment(const char* file)
 {
   simgrid::s4u::Engine::get_instance()->load_deployment(file);
 }
-void sg_engine_run()
+void simgrid_run()
 {
   simgrid::s4u::Engine::get_instance()->run();
 }
-void sg_engine_register_function(const char* name, int (*code)(int, char**))
+void simgrid_register_function(const char* name, int (*code)(int, char**))
 {
   simgrid::s4u::Engine::get_instance()->register_function(name, code);
 }
-void sg_engine_register_default(int (*code)(int, char**))
+void simgrid_register_default(int (*code)(int, char**))
 {
   simgrid::s4u::Engine::get_instance()->register_default(code);
 }
-double sg_engine_get_clock()
+double simgrid_get_clock()
 {
   return simgrid::s4u::Engine::get_clock();
 }