give a network_model to each NetZone (unused for now)

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

diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp
index 2e9732e..1b403b1 100644 (file)
--- a/src/kernel/routing/FloydZone.cpp
+++ b/src/kernel/routing/FloydZone.cpp
@@ -6,8 +6,8 @@
 #include "simgrid/kernel/routing/FloydZone.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
-#include "xbt/log.h"
 #include "src/surf/xml/platf_private.hpp"
+#include "surf/surf.hpp"
 
 #include <cfloat>
 #include <limits>
@@ -22,7 +22,8 @@ namespace simgrid {
 namespace kernel {
 namespace routing {
 
-FloydZone::FloydZone(NetZone* father, std::string name) : RoutedZone(father, name)
+FloydZone::FloydZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel)
+    : RoutedZone(father, name, netmodel)
 {
   predecessor_table_ = nullptr;
   cost_table_        = nullptr;
@@ -33,7 +34,7 @@ FloydZone::~FloydZone()
 {
   if (link_table_ == nullptr) // Dealing with a parse error in the file?
     return;
-  unsigned int table_size = getTableSize();
+  unsigned int table_size = get_table_size();
   /* Delete link_table */
   for (unsigned int i = 0; i < table_size; i++)
     for (unsigned int j = 0; j < table_size; j++)
@@ -44,11 +45,11 @@ FloydZone::~FloydZone()
   delete[] cost_table_;
 }
 
-void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
+void FloydZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat)
 {
-  unsigned int table_size = getTableSize();
+  unsigned int table_size = get_table_size();
 
-  getRouteCheckParams(src, dst);
+  get_route_check_params(src, dst);
 
   /* create a result route */
   std::vector<RouteCreationArgs*> route_stack;
@@ -66,7 +67,7 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* r
     route->gw_dst = route_stack.front()->gw_dst;
   }
 
-  sg_netpoint_t prev_dst_gw = nullptr;
+  NetPoint* prev_dst_gw = nullptr;
   while (not route_stack.empty()) {
     RouteCreationArgs* e_route = route_stack.back();
     route_stack.pop_back();
@@ -78,21 +79,20 @@ void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* r
     for (auto const& link : e_route->link_list) {
       route->link_list.push_back(link);
       if (lat)
-        *lat += link->latency();
+        *lat += link->get_latency();
     }
 
     prev_dst_gw = e_route->gw_dst;
   }
 }
 
-void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
-                         kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
-                         std::vector<simgrid::surf::LinkImpl*>& link_list, bool symmetrical)
+void FloydZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+                          std::vector<resource::LinkImpl*>& link_list, bool symmetrical)
 {
   /* set the size of table routing */
-  unsigned int table_size = getTableSize();
+  unsigned int table_size = get_table_size();
 
-  addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical);
+  add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
 
   if (not link_table_) {
     /* Create Cost, Predecessor and Link tables */
@@ -120,7 +120,7 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi
                dst->get_cname());
 
   TO_FLOYD_LINK(src->id(), dst->id()) =
-      newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
+      new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1);
   TO_FLOYD_PRED(src->id(), dst->id()) = src->id();
   TO_FLOYD_COST(src->id(), dst->id()) = (TO_FLOYD_LINK(src->id(), dst->id()))->link_list.size();
 
@@ -148,7 +148,7 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi
                 src->get_cname(), gw_dst->get_cname());
 
     TO_FLOYD_LINK(dst->id(), src->id()) =
-        newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0);
+        new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0);
     TO_FLOYD_PRED(dst->id(), src->id()) = dst->id();
     TO_FLOYD_COST(dst->id(), src->id()) =
         (TO_FLOYD_LINK(dst->id(), src->id()))->link_list.size(); /* count of links, old model assume 1 */
@@ -158,7 +158,7 @@ void FloydZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoi
 void FloydZone::seal()
 {
   /* set the size of table routing */
-  unsigned int table_size = getTableSize();
+  unsigned int table_size = get_table_size();
 
   if (not link_table_) {
     /* Create Cost, Predecessor and Link tables */