X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac1a20b7812ac81b11dd8f8c44dbe1ee08647e22..6bc18b576fa4a890d8b9916d292ca67dfbf60dd3:/src/s4u/s4u_Engine.cpp diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index ae8756053a..3f8d5677e8 100644 --- 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)) +{ + SIMIX_function_register(name, code); +} void Engine::register_default(int (*code)(int, char**)) { SIMIX_function_register_default(code); @@ -102,7 +106,6 @@ void Engine::getHostList(std::vector* list) list->push_back(kv.second); } -/** @brief Returns the list of all hosts found in the platform */ std::vector Engine::get_all_hosts() { std::vector res; @@ -139,7 +142,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); } @@ -370,28 +373,28 @@ void simgrid_init(int* argc, char** argv) { simgrid::s4u::Engine e(argc, argv); } -void sg_engine_load_platform(const char* file) +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(); }