X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/58eba10aaac5f6e03cb6ddbe696c388703ba2fe4..5f1dc33c9f76ee99973ba93f034f031451398ebe:/src/s4u/s4u_engine.cpp

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 9ab100720c..07fa11beb4 100644
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -35,16 +35,18 @@ Engine::Engine(int *argc, char **argv) {
   s4u::Engine::instance_ = this;
   pimpl                  = new kernel::EngineImpl();
 
-  TRACE_global_init(argc, argv);
+  TRACE_global_init();
   SIMIX_global_init(argc, argv);
 }
 
 Engine::~Engine()
 {
   delete pimpl;
+  s4u::Engine::instance_ = nullptr;
 }
 
-Engine *Engine::instance() {
+Engine* Engine::getInstance()
+{
   if (s4u::Engine::instance_ == nullptr)
     new Engine(0,nullptr);
   return s4u::Engine::instance_;
@@ -52,7 +54,6 @@ Engine *Engine::instance() {
 
 void Engine::shutdown() {
   delete s4u::Engine::instance_;
-  s4u::Engine::instance_ = nullptr;
 }
 
 double Engine::getClock()
@@ -80,14 +81,14 @@ void Engine::loadDeployment(const char *deploy)
 // FIXME: The following duplicates the content of s4u::Host
 extern std::map<std::string, simgrid::s4u::Host*> host_list;
 /** @brief Returns the amount of hosts in the platform */
-size_t Engine::hostCount()
+size_t Engine::getHostCount()
 {
   return host_list.size();
 }
 /** @brief Fills the passed list with all hosts found in the platform */
-void Engine::hostList(std::vector<Host*>* list)
+void Engine::getHostList(std::vector<Host*>* list)
 {
-  for (auto kv : host_list)
+  for (auto const& kv : host_list)
     list->push_back(kv.second);
 }
 
@@ -99,17 +100,17 @@ void Engine::run() {
   }
 }
 
-s4u::NetZone* Engine::netRoot()
+s4u::NetZone* Engine::getNetRoot()
 {
   return pimpl->netRoot_;
 }
 
 static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* name)
 {
-  if (not strcmp(current->name(), name))
+  if (not strcmp(current->getCname(), name))
     return current;
 
-  for (auto elem : *(current->children())) {
+  for (auto const& elem : *(current->getChildren())) {
     simgrid::s4u::NetZone* tmp = netzoneByNameRecursive(elem, name);
     if (tmp != nullptr) {
       return tmp;
@@ -119,22 +120,22 @@ static s4u::NetZone* netzoneByNameRecursive(s4u::NetZone* current, const char* n
 }
 
 /** @brief Retrieve the NetZone of the given name (or nullptr if not found) */
-NetZone* Engine::netzoneByNameOrNull(const char* name)
+NetZone* Engine::getNetzoneByNameOrNull(const char* name)
 {
-  return netzoneByNameRecursive(netRoot(), name);
+  return netzoneByNameRecursive(getNetRoot(), name);
 }
 
 /** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
-simgrid::kernel::routing::NetPoint* Engine::netpointByNameOrNull(const char* name)
+simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(std::string name)
 {
-  if (pimpl->netpoints_.find(name) == pimpl->netpoints_.end())
-    return nullptr;
-  return pimpl->netpoints_.at(name);
+  auto netp = pimpl->netpoints_.find(name);
+  return netp == pimpl->netpoints_.end() ? nullptr : netp->second;
 }
+
 /** @brief Fill the provided vector with all existing netpoints */
-void Engine::netpointList(std::vector<simgrid::kernel::routing::NetPoint*>* list)
+void Engine::getNetpointList(std::vector<simgrid::kernel::routing::NetPoint*>* list)
 {
-  for (auto kv : pimpl->netpoints_)
+  for (auto const& kv : pimpl->netpoints_)
     list->push_back(kv.second);
 }
 /** @brief Register a new netpoint to the system */
@@ -157,5 +158,9 @@ bool Engine::isInitialized()
 {
   return Engine::instance_ != nullptr;
 }
+void Engine::setConfig(std::string str)
+{
+  xbt_cfg_set_parse(str.c_str());
+}
 }
 } // namespace