X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..30aca4d4af004d1ec899d12f0a9fe3997e9be15e:/src/surf/instr_routing.cpp

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index d0c5cb8fa8..a071a3c225 100644
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -8,7 +8,7 @@
 
 #include "simgrid/s4u/engine.hpp"
 #include "simgrid/s4u/host.hpp"
-#include "src/kernel/routing/AsImpl.hpp"
+#include "src/kernel/routing/NetZoneImpl.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.h"
 #include "xbt/graph.h"
@@ -123,21 +123,21 @@ static void linkContainers (container_t src, container_t dst, xbt_dict_t filter)
   XBT_DEBUG ("  linkContainers %s <-> %s", src->name, dst->name);
 }
 
-static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t container, xbt_dict_t filter)
+static void recursiveGraphExtraction(simgrid::s4u::NetZone* netzone, container_t container, xbt_dict_t filter)
 {
   if (!TRACE_platform_topology()){
     XBT_DEBUG("Graph extraction disabled by user.");
     return;
   }
-  XBT_DEBUG ("Graph extraction for routing_component = %s", as->name());
-  if (!xbt_dict_is_empty(as->children())){
+  XBT_DEBUG("Graph extraction for NetZone = %s", netzone->name());
+  if (!xbt_dict_is_empty(netzone->children())) {
     xbt_dict_cursor_t cursor = nullptr;
-    AS_t rc_son;
+    NetZone_t nz_son;
     char *child_name;
     //bottom-up recursion
-    xbt_dict_foreach(as->children(), cursor, child_name, rc_son) {
-      container_t child_container = (container_t) xbt_dict_get (container->children, rc_son->name());
-      recursiveGraphExtraction (rc_son, child_container, filter);
+    xbt_dict_foreach (netzone->children(), cursor, child_name, nz_son) {
+      container_t child_container = (container_t)xbt_dict_get(container->children, nz_son->name());
+      recursiveGraphExtraction(nz_son, child_container, filter);
     }
   }
 
@@ -150,7 +150,7 @@ static void recursiveGraphExtraction (simgrid::s4u::As *as, container_t containe
     xbt_dict_cursor_t cursor = nullptr;
     char *edge_name;
 
-    static_cast<simgrid::kernel::routing::AsImpl*>(as)->getGraph(graph, nodes, edges);
+    static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->getGraph(graph, nodes, edges);
     xbt_dict_foreach(edges,cursor,edge_name,edge) {
         linkContainers(
           PJ_container_get((const char*) edge->src->data),
@@ -249,7 +249,7 @@ static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link)
 void sg_instr_new_host(simgrid::s4u::Host& host)
 {
   container_t father = currentContainer.back();
-  container_t container = PJ_container_new(host.name().c_str(), INSTR_HOST, father);
+  container_t container = PJ_container_new(host.cname(), INSTR_HOST, father);
 
   if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_speed())) {
     type_t speed = PJ_type_get_or_null ("power", container->type);
@@ -318,7 +318,7 @@ static void instr_routing_parse_end_platform ()
   currentContainer.clear();
   xbt_dict_t filter = xbt_dict_new_homogeneous(xbt_free_f);
   XBT_DEBUG ("Starting graph extraction.");
-  recursiveGraphExtraction (simgrid::s4u::Engine::instance()->rootAs(), PJ_container_get_root(), filter);
+  recursiveGraphExtraction(simgrid::s4u::Engine::instance()->netRoot(), PJ_container_get_root(), filter);
   XBT_DEBUG ("Graph extraction finished.");
   xbt_dict_free(&filter);
   platform_created = 1;
@@ -429,22 +429,21 @@ int instr_platform_traced ()
 
 #define GRAPHICATOR_SUPPORT_FUNCTIONS
 
-static void recursiveXBTGraphExtraction (xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges,
-    AS_t as, container_t container)
+static void recursiveXBTGraphExtraction(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges, NetZone_t netzone,
+                                        container_t container)
 {
-  if (!xbt_dict_is_empty(as->children())){
+  if (!xbt_dict_is_empty(netzone->children())) {
     xbt_dict_cursor_t cursor = nullptr;
-    AS_t as_child;
+    NetZone_t netzone_child;
     char *child_name;
     //bottom-up recursion
-    xbt_dict_foreach(as->children(), cursor, child_name, as_child) {
-      container_t child_container = (container_t) xbt_dict_get (
-        container->children, as_child->name());
-      recursiveXBTGraphExtraction (graph, nodes, edges, as_child, child_container);
+    xbt_dict_foreach (netzone->children(), cursor, child_name, netzone_child) {
+      container_t child_container = (container_t)xbt_dict_get(container->children, netzone_child->name());
+      recursiveXBTGraphExtraction(graph, nodes, edges, netzone_child, child_container);
     }
   }
 
-  static_cast<simgrid::kernel::routing::AsImpl*>(as)->getGraph(graph, nodes, edges);
+  static_cast<simgrid::kernel::routing::NetZoneImpl*>(netzone)->getGraph(graph, nodes, edges);
 }
 
 xbt_graph_t instr_routing_platform_graph ()
@@ -452,7 +451,7 @@ xbt_graph_t instr_routing_platform_graph ()
   xbt_graph_t ret = xbt_graph_new_graph (0, nullptr);
   xbt_dict_t nodes = xbt_dict_new_homogeneous(nullptr);
   xbt_dict_t edges = xbt_dict_new_homogeneous(nullptr);
-  recursiveXBTGraphExtraction (ret, nodes, edges, simgrid::s4u::Engine::instance()->rootAs(), PJ_container_get_root());
+  recursiveXBTGraphExtraction(ret, nodes, edges, simgrid::s4u::Engine::instance()->netRoot(), PJ_container_get_root());
   xbt_dict_free (&nodes);
   xbt_dict_free (&edges);
   return ret;