Friday smell chase

[simgrid.git] / src / kernel / routing / DijkstraZone.cpp

diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp
index 7506809..d0e07ee 100644 (file)
--- a/src/kernel/routing/DijkstraZone.cpp
+++ b/src/kernel/routing/DijkstraZone.cpp
@@ -4,7 +4,7 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/kernel/routing/DijkstraZone.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
 
 #include <float.h>
@@ -45,7 +45,8 @@ namespace routing {
 void DijkstraZone::seal()
 {
   xbt_node_t node = nullptr;
-  unsigned int cursor2, cursor;
+  unsigned int cursor2;
+  unsigned int cursor;
 
   /* Create the topology graph */
   if (!routeGraph_)
@@ -68,7 +69,7 @@ void DijkstraZone::seal()
 
       if (!found) {
         sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
-        e_route->link_list             = new std::vector<Link*>();
+        e_route->link_list             = new std::vector<surf::LinkImpl*>();
         e_route->link_list->push_back(surf_network_model->loopback_);
         xbt_graph_new_edge(routeGraph_, node, node, e_route);
       }
@@ -86,16 +87,12 @@ void DijkstraZone::seal()
 
 xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id)
 {
-  xbt_node_t node              = nullptr;
-  graph_node_data_t data       = nullptr;
-  graph_node_map_element_t elm = nullptr;
-
-  data           = xbt_new0(struct graph_node_data, 1);
+  graph_node_data_t data         = xbt_new0(struct graph_node_data, 1);
   data->id       = id;
   data->graph_id = graph_id;
-  node           = xbt_graph_new_node(routeGraph_, data);
 
-  elm       = xbt_new0(struct graph_node_map_element, 1);
+  xbt_node_t node                = xbt_graph_new_node(routeGraph_, data);
+  graph_node_map_element_t elm   = xbt_new0(struct graph_node_map_element, 1);
   elm->node = node;
   xbt_dict_set_ext(graphNodeMap_, (char*)(&id), sizeof(int), (xbt_dictelm_t)elm, nullptr);
 
@@ -141,7 +138,7 @@ void DijkstraZone::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_rou
   xbt_graph_new_edge(routeGraph_, src, dst, e_route);
 }
 
-void DijkstraZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat)
+void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
 {
   getRouteCheckParams(src, dst);
   int src_id = src->id();
@@ -173,7 +170,7 @@ void DijkstraZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbar
     for (auto link : *e_route->link_list) {
       route->link_list->insert(route->link_list->begin(), link);
       if (lat)
-        *lat += static_cast<Link*>(link)->latency();
+        *lat += static_cast<surf::LinkImpl*>(link)->latency();
     }
   }
 
@@ -209,7 +206,7 @@ void DijkstraZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbar
 
     /* apply dijkstra using the indexes from the graph's node array */
     while (xbt_heap_size(pqueue) > 0) {
-      int* v_id         = (int*)xbt_heap_pop(pqueue);
+      int* v_id         = static_cast<int*>(xbt_heap_pop(pqueue));
       xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t);
       xbt_edge_t edge   = nullptr;
       unsigned int cursor;
@@ -239,8 +236,11 @@ void DijkstraZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbar
   }
 
   /* compose route path with links */
-  NetCard *gw_src = nullptr, *gw_dst, *prev_gw_src, *first_gw = nullptr;
-  NetCard *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = nullptr;
+  NetPoint *gw_src = nullptr;
+  NetPoint *gw_dst;
+  NetPoint *prev_gw_src;
+  NetPoint *first_gw = nullptr;
+  NetPoint *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = nullptr;
 
   for (int v = dst_node_id; v != src_node_id; v = pred_arr[v]) {
     xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t);
@@ -261,11 +261,11 @@ void DijkstraZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbar
 
     if (hierarchy_ == RoutingMode::recursive && v != dst_node_id &&
         strcmp(gw_dst->name().c_str(), prev_gw_src->name().c_str())) {
-      std::vector<Link*>* e_route_as_to_as = new std::vector<Link*>();
+      std::vector<surf::LinkImpl*> e_route_as_to_as;
 
-      getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr);
+      getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, &e_route_as_to_as, nullptr);
       auto pos = route->link_list->begin();
-      for (auto link : *e_route_as_to_as) {
+      for (auto link : e_route_as_to_as) {
         route->link_list->insert(pos, link);
         if (lat)
           *lat += link->latency();
@@ -276,7 +276,7 @@ void DijkstraZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbar
     for (auto link : *e_route->link_list) {
       route->link_list->insert(route->link_list->begin(), link);
       if (lat)
-        *lat += static_cast<Link*>(link)->latency();
+        *lat += static_cast<surf::LinkImpl*>(link)->latency();
     }
     size++;
   }
@@ -315,8 +315,8 @@ DijkstraZone::DijkstraZone(NetZone* father, const char* name, bool cached) : Rou
 
 void DijkstraZone::addRoute(sg_platf_route_cbarg_t route)
 {
-  NetCard* src        = route->src;
-  NetCard* dst        = route->dst;
+  NetPoint* src       = route->src;
+  NetPoint* dst       = route->dst;
   const char* srcName = src->name().c_str();
   const char* dstName = dst->name().c_str();
 
@@ -353,7 +353,7 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route)
              route->gw_src->name().c_str());
 
     if (route->gw_dst && route->gw_src) {
-      NetCard* gw_tmp = route->gw_src;
+      NetPoint* gw_tmp = route->gw_src;
       route->gw_src   = route->gw_dst;
       route->gw_dst   = gw_tmp;
     }