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 9913599..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();
@@ -92,6 +91,14 @@ void Engine::getHostList(std::vector<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;
@@ -115,11 +122,18 @@ 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()) {
@@ -154,21 +168,6 @@ NetZone* Engine::getNetzoneByNameOrNull(const char* name)
   return netzoneByNameRecursive(getNetRoot(), name);
 }
 
-template <class T> void netzoneByTypeRecursive(s4u::NetZone* current, std::vector<T*>* whereto)
-{
-  for (auto const& elem : *(current->getChildren())) {
-    netzoneByTypeRecursive(elem, whereto);
-    if (elem == dynamic_cast<T*>(elem))
-      whereto->push_back(elem);
-  }
-}
-
-/** @brief Retrieve all existing NetZones of the subtype of the whereto vector */
-template <class T> void Engine::getNetzoneByType(std::vector<T*>* whereto)
-{
-  netzoneByTypeRecursive(getNetRoot(), whereto);
-}
-
 /** @brief Retrieve the netpoint of the given name (or nullptr if not found) */
 simgrid::kernel::routing::NetPoint* Engine::getNetpointByNameOrNull(std::string name)
 {