code simplification: write the recursivity properly

diff --git a/src/kernel/routing/AsImpl.cpp b/src/kernel/routing/AsImpl.cpp
index 9fe0cef..a0841b9 100644 (file)
--- a/src/kernel/routing/AsImpl.cpp
+++ b/src/kernel/routing/AsImpl.cpp
@@ -43,6 +43,13 @@ namespace simgrid {
 
   void AsImpl::getOneLinkRoutes(std::vector<Onelink*>* accumulator)
   {
 
   void AsImpl::getOneLinkRoutes(std::vector<Onelink*>* accumulator)
   {

+    // recursing only. I have no route myself :)
+    char* key;
+    xbt_dict_cursor_t cursor = nullptr;
+    AsImpl* rc_child;
+    xbt_dict_foreach (children(), cursor, key, rc_child) {
+      rc_child->getOneLinkRoutes(accumulator);
+    }

   }
 
   /** @brief Get the common ancestor and its first children in each line leading to src and dst
   }
 
   /** @brief Get the common ancestor and its first children in each line leading to src and dst

diff --git a/src/kernel/routing/AsRoutedGraph.cpp b/src/kernel/routing/AsRoutedGraph.cpp
index 592ad3c..20b0910 100644 (file)
--- a/src/kernel/routing/AsRoutedGraph.cpp
+++ b/src/kernel/routing/AsRoutedGraph.cpp
@@ -107,7 +107,8 @@ void AsRoutedGraph::getOneLinkRoutes(std::vector<Onelink*>* accumulator)
       }
     }
   }
       }
     }
   }

-  }
+  AsImpl::getOneLinkRoutes(accumulator); // Recursivly call this function on all my childs too
+}

 
 void AsRoutedGraph::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
 {
 
 void AsRoutedGraph::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
 {

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index b1b6a12..d4cd3d5 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -100,24 +100,10 @@ void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, std::vector<Li
   AsImpl::getRouteRecursive(src, dst, route, latency);
 }
 
   AsImpl::getRouteRecursive(src, dst, route, latency);
 }
 

-static void _recursiveGetOneLinkRoutes(AsImpl* as, std::vector<Onelink*>* accumulator)
-{
-  //adding my one link routes
-  as->getOneLinkRoutes(accumulator);
-
-  //recursing
-  char *key;
-  xbt_dict_cursor_t cursor = nullptr;
-  AsImpl *rc_child;
-  xbt_dict_foreach(as->children(), cursor, key, rc_child) {
-    _recursiveGetOneLinkRoutes(rc_child, accumulator);
-  }
-}
-

 std::vector<Onelink*>* RoutingPlatf::getOneLinkRoutes()
 {
   std::vector<Onelink*>* res = new std::vector<Onelink*>();
 std::vector<Onelink*>* RoutingPlatf::getOneLinkRoutes()
 {
   std::vector<Onelink*>* res = new std::vector<Onelink*>();

-  _recursiveGetOneLinkRoutes(root_, res);
+  root_->getOneLinkRoutes(res);

   return res;
 }
 
   return res;
 }