X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18bee871381a6ce670d9da211f43ab9b55fdc350..5d4bf7d1cd502bc979d98e35067872186f2a0a21:/src/surf/instr_routing.cpp

diff --git a/src/surf/instr_routing.cpp b/src/surf/instr_routing.cpp
index 0bf0be396e..f9ebbc6af0 100644
--- a/src/surf/instr_routing.cpp
+++ b/src/surf/instr_routing.cpp
@@ -8,7 +8,9 @@
 
 #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/network_interface.hpp"
 #include "src/surf/xml/platf_private.hpp"
 #include "surf/surf.h"
 #include "xbt/graph.h"
@@ -123,21 +125,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 +152,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),
@@ -204,44 +206,33 @@ void sg_instr_AS_end()
   }
 }
 
-static void instr_routing_parse_start_link (sg_platf_link_cbarg_t link)
+static void instr_routing_parse_start_link(simgrid::surf::LinkImpl* link)
 {
+  if (currentContainer.empty()) // No ongoing parsing. Are you creating the loopback?
+    return;
   container_t father = currentContainer.back();
 
-  double bandwidth_value = link->bandwidth;
-  double latency_value = link->latency;
-  std::vector<std::string> links_to_create;
-
-  if (link->policy == SURF_LINK_FULLDUPLEX){
-    std::string id (link->id);
-    std::string up = id + "_UP";
-    std::string down = id + "_DOWN";
-    links_to_create.push_back(up);
-    links_to_create.push_back(down);
-  }else{
-    links_to_create.push_back(link->id);
-  }
+  double bandwidth_value = link->bandwidth();
+  double latency_value   = link->latency();
 
-  for (auto link_name: links_to_create){
-    container_t container = PJ_container_new (link_name.c_str(), INSTR_LINK, father);
+  container_t container = PJ_container_new(link->getName(), INSTR_LINK, father);
 
-    if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) {
-      type_t bandwidth = PJ_type_get_or_null ("bandwidth", container->type);
-      if (bandwidth == nullptr){
-        bandwidth = PJ_type_variable_new ("bandwidth", nullptr, container->type);
-      }
-      type_t latency = PJ_type_get_or_null ("latency", container->type);
-      if (latency == nullptr){
-        latency = PJ_type_variable_new ("latency", nullptr, container->type);
-      }
-      new_pajeSetVariable (0, container, bandwidth, bandwidth_value);
-      new_pajeSetVariable (0, container, latency, latency_value);
+  if ((TRACE_categorized() || TRACE_uncategorized() || TRACE_platform()) && (! TRACE_disable_link())) {
+    type_t bandwidth = PJ_type_get_or_null("bandwidth", container->type);
+    if (bandwidth == nullptr) {
+      bandwidth = PJ_type_variable_new("bandwidth", nullptr, container->type);
     }
-    if (TRACE_uncategorized()){
-      type_t bandwidth_used = PJ_type_get_or_null ("bandwidth_used", container->type);
-      if (bandwidth_used == nullptr){
-        PJ_type_variable_new ("bandwidth_used", "0.5 0.5 0.5", container->type);
-      }
+    type_t latency = PJ_type_get_or_null("latency", container->type);
+    if (latency == nullptr) {
+      latency = PJ_type_variable_new("latency", nullptr, container->type);
+    }
+    new_pajeSetVariable(0, container, bandwidth, bandwidth_value);
+    new_pajeSetVariable(0, container, latency, latency_value);
+  }
+  if (TRACE_uncategorized()) {
+    type_t bandwidth_used = PJ_type_get_or_null("bandwidth_used", container->type);
+    if (bandwidth_used == nullptr) {
+      PJ_type_variable_new("bandwidth_used", "0.5 0.5 0.5", container->type);
     }
   }
 }
@@ -307,10 +298,12 @@ void sg_instr_new_host(simgrid::s4u::Host& host)
 
 }
 
-void sg_instr_new_router(sg_platf_router_cbarg_t router)
+void sg_instr_new_router(const char* name)
 {
-  container_t father = currentContainer.back();
-  PJ_container_new (router->id, INSTR_ROUTER, father);
+  if (TRACE_is_enabled() && TRACE_needs_platform()) {
+    container_t father = currentContainer.back();
+    PJ_container_new(name, INSTR_ROUTER, father);
+  }
 }
 
 static void instr_routing_parse_end_platform ()
@@ -318,7 +311,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;
@@ -331,8 +324,8 @@ void instr_routing_define_callbacks ()
   //always need the call backs to ASes (we need only the root AS),
   //to create the rootContainer and the rootType properly
   if (!TRACE_needs_platform()) return;
-  simgrid::surf::on_link.connect(instr_routing_parse_start_link);
-  simgrid::surf::on_postparse.connect(instr_routing_parse_end_platform);
+  simgrid::surf::LinkImpl::onCreation.connect(instr_routing_parse_start_link);
+  simgrid::s4u::onPlatformCreated.connect(instr_routing_parse_end_platform);
 }
 
 /*
@@ -429,22 +422,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 +444,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;