Also simplify the API of Engine::getLinkList

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

diff --git a/src/s4u/s4u_engine.cpp b/src/s4u/s4u_engine.cpp
index 97f2d89..5a231d6 100644 (file)
--- a/src/s4u/s4u_engine.cpp
+++ b/src/s4u/s4u_engine.cpp
@@ -30,7 +30,6 @@ xbt::signal<void(void)> onDeadlock;
 
 Engine *Engine::instance_ = nullptr; /* That singleton is awful, but I don't see no other solution right now. */
 
-
 Engine::Engine(int *argc, char **argv) {
   xbt_assert(s4u::Engine::instance_ == nullptr, "It is currently forbidden to create more than one instance of s4u::Engine");
   TRACE_global_init();
@@ -81,29 +80,60 @@ void Engine::loadDeployment(const char *deploy)
 {
   SIMIX_launch_application(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::getHostCount()
 {
-  return host_list.size();
+  return pimpl->hosts_.size();
 }
 /** @brief Fills the passed list with all hosts found in the platform */
 void Engine::getHostList(std::vector<Host*>* list)
 {
-  for (auto const& kv : host_list)
+  for (auto const& kv : pimpl->hosts_)
     list->push_back(kv.second);
 }
+/** @brief Returns the list of all hosts found in the platform */
+std::vector<Host*> Engine::getHostList()
+{
+  std::vector<Host*> res;
+  for (auto const& kv : pimpl->hosts_)
+    res.push_back(kv.second);
+  return res;
+}
+void Engine::addHost(std::string name, simgrid::s4u::Host* host)
+{
+  pimpl->hosts_[name] = host;
+}
+void Engine::delHost(std::string name)
+{
+  pimpl->hosts_.erase(name);
+}
+simgrid::s4u::Host* Engine::hostByName(std::string name)
+{
+  return pimpl->hosts_.at(name); // Will raise a std::out_of_range if the host does not exist
+}
+simgrid::s4u::Host* Engine::hostByNameOrNull(std::string name)
+{
+  auto host = pimpl->hosts_.find(name);
+  return host == pimpl->hosts_.end() ? nullptr : host->second;
+}
+
 /** @brief Returns the amount of links in the platform */
 size_t Engine::getLinkCount()
 {
   return simgrid::surf::LinkImpl::linksCount();
 }
-/** @brief Fills the passed list with all hosts found in the platform */
+/** @brief Fills the passed list with all links found in the platform */
 void Engine::getLinkList(std::vector<Link*>* list)
 {
   simgrid::surf::LinkImpl::linksList(list);
 }
+/** @brief Returns the list of all links found in the platform */
+std::vector<Link*> Engine::getLinkList()
+{
+  std::vector<Link*> res;
+  simgrid::surf::LinkImpl::linksList(&res);
+  return res;
+}
 
 void Engine::run() {
   if (MC_is_active()) {