Merge branches 'master' and 'master' of github.com:simgrid/simgrid

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

diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp
index 0caacff..894aa18 100644 (file)
--- a/src/kernel/routing/FloydZone.cpp
+++ b/src/kernel/routing/FloydZone.cpp
@@ -3,9 +3,8 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-
 #include "src/kernel/routing/FloydZone.hpp"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
 #include "xbt/log.h"
 
@@ -44,7 +43,7 @@ FloydZone::~FloydZone()
   xbt_free(costTable_);
 }
 
-void FloydZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat)
+void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
 {
   size_t table_size = vertices_.size();
 
@@ -66,8 +65,8 @@ void FloydZone::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t
     route->gw_dst = route_stack.front()->gw_dst;
   }
 
-  sg_netcard_t prev_dst_gw = nullptr;
-  while (!route_stack.empty()) {
+  sg_netpoint_t prev_dst_gw = nullptr;
+  while (not route_stack.empty()) {
     sg_platf_route_cbarg_t e_route = route_stack.back();
     route_stack.pop_back();
     if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr &&
@@ -92,7 +91,7 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route)
 
   addRouteCheckParams(route);
 
-  if (!linkTable_) {
+  if (not linkTable_) {
     /* Create Cost, Predecessor and Link tables */
     costTable_        = xbt_new0(double, table_size* table_size);                  /* link cost from host to host */
     predecessorTable_ = xbt_new0(int, table_size* table_size);                     /* predecessor host numbers */
@@ -136,12 +135,12 @@ void FloydZone::addRoute(sg_platf_route_cbarg_t route)
                  route->dst->name().c_str(), route->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;
     }
 
-    if (!route->gw_src && !route->gw_dst)
+    if (not route->gw_src && not route->gw_dst)
       XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->name().c_str(), route->src->name().c_str());
     else
       XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name().c_str(), route->gw_src->name().c_str(),
@@ -159,7 +158,7 @@ void FloydZone::seal()
   /* set the size of table routing */
   size_t table_size = vertices_.size();
 
-  if (!linkTable_) {
+  if (not linkTable_) {
     /* Create Cost, Predecessor and Link tables */
     costTable_        = xbt_new0(double, table_size* table_size);                  /* link cost from host to host */
     predecessorTable_ = xbt_new0(int, table_size* table_size);                     /* predecessor host numbers */
@@ -178,11 +177,11 @@ void FloydZone::seal()
   if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
     for (unsigned int i = 0; i < table_size; i++) {
       sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i);
-      if (!e_route) {
+      if (not e_route) {
         e_route            = xbt_new0(s_sg_platf_route_cbarg_t, 1);
         e_route->gw_src    = nullptr;
         e_route->gw_dst    = nullptr;
-        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_);
         TO_FLOYD_LINK(i, i) = e_route;
         TO_FLOYD_PRED(i, i) = i;