A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge nested try blocks (Sonar).
[simgrid.git]
/
src
/
s4u
/
s4u_Engine.cpp
diff --git
a/src/s4u/s4u_Engine.cpp
b/src/s4u/s4u_Engine.cpp
index
0a0a3b3
..
3f8d567
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);
@@
-102,7
+106,6
@@
void Engine::getHostList(std::vector<Host*>* list)
list->push_back(kv.second);
}
-/** @brief Returns the list of all hosts found in the platform */
std::vector<Host*> Engine::get_all_hosts()
{
std::vector<Host*> 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);
}
@@
-200,7
+203,7
@@
std::vector<Storage*> Engine::get_all_storages()
*/
simgrid::s4u::Storage* Engine::storage_by_name(std::string name)
{
- if (pimpl->
links_.find(name) == pimpl->link
s_.end())
+ if (pimpl->
storages_.find(name) == pimpl->storage
s_.end())
throw std::invalid_argument(std::string("Storage not found: ") + name);
return pimpl->storages_.at(name);
@@
-366,28
+369,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 s
g_engine
_load_deployment(const char* file)
+void s
imgrid
_load_deployment(const char* file)
{
simgrid::s4u::Engine::get_instance()->load_deployment(file);
}
-void s
g_engine
_run()
+void s
imgrid
_run()
{
simgrid::s4u::Engine::get_instance()->run();
}
-void s
g_engine
_register_function(const char* name, int (*code)(int, char**))
+void s
imgrid
_register_function(const char* name, int (*code)(int, char**))
{
simgrid::s4u::Engine::get_instance()->register_function(name, code);
}
-void s
g_engine
_register_default(int (*code)(int, char**))
+void s
imgrid
_register_default(int (*code)(int, char**))
{
simgrid::s4u::Engine::get_instance()->register_default(code);
}
-double s
g_engine
_get_clock()
+double s
imgrid
_get_clock()
{
return simgrid::s4u::Engine::get_clock();
}