X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/22e6546d2c6f14864cc93c4ed1470d8e8c1e2d95..HEAD:/src/kernel/routing/FloydZone.cpp

diff --git a/src/kernel/routing/FloydZone.cpp b/src/kernel/routing/FloydZone.cpp
index b434384bcd..350ce04177 100644
--- a/src/kernel/routing/FloydZone.cpp
+++ b/src/kernel/routing/FloydZone.cpp
@@ -1,189 +1,142 @@
-/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2023. The SimGrid Team. All rights reserved.          */
 
 /* 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/NetPoint.hpp"
-#include "src/surf/network_interface.hpp"
-#include "xbt/log.h"
+#include <simgrid/kernel/routing/FloydZone.hpp>
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <xbt/string.hpp>
 
-#include <cfloat>
-#include <limits>
+#include "src/kernel/resource/NetworkModel.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
+#include <climits>
 
-#define TO_FLOYD_COST(i, j) (costTable_)[(i) + (j)*table_size]
-#define TO_FLOYD_PRED(i, j) (predecessorTable_)[(i) + (j)*table_size]
-#define TO_FLOYD_LINK(i, j) (linkTable_)[(i) + (j)*table_size]
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_routing_floyd, ker_platform, "Kernel Floyd Routing");
 
 namespace simgrid {
-namespace kernel {
-namespace routing {
+namespace kernel::routing {
 
-FloydZone::FloydZone(NetZone* father, std::string name) : RoutedZone(father, name)
+void FloydZone::init_tables(unsigned int table_size)
 {
-  predecessorTable_ = nullptr;
-  costTable_        = nullptr;
-  linkTable_        = nullptr;
-}
-
-FloydZone::~FloydZone()
-{
-  if (linkTable_ == nullptr) // Dealing with a parse error in the file?
-    return;
-  unsigned int table_size = getTableSize();
-  /* Delete link_table */
-  for (unsigned int i = 0; i < table_size; i++)
-    for (unsigned int j = 0; j < table_size; j++)
-      routing_route_free(TO_FLOYD_LINK(i, j));
-  delete[] linkTable_;
-
-  delete[] predecessorTable_;
-  delete[] costTable_;
+  if (link_table_.size() != table_size) {
+    /* Resize and initialize Cost, Predecessor and Link tables */
+    cost_table_.resize(table_size);
+    link_table_.resize(table_size);
+    predecessor_table_.resize(table_size);
+    for (auto& cost : cost_table_)
+      cost.resize(table_size, ULONG_MAX); /* link cost from host to host */
+    for (auto& link : link_table_)
+      link.resize(table_size); /* actual link between src and dst */
+    for (auto& predecessor : predecessor_table_)
+      predecessor.resize(table_size, -1); /* predecessor host numbers */
+  }
 }
 
-void FloydZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
+void FloydZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat)
 {
-  unsigned int table_size = getTableSize();
-
-  getRouteCheckParams(src, dst);
+  get_route_check_params(src, dst);
 
   /* create a result route */
-  std::vector<sg_platf_route_cbarg_t> route_stack;
-  unsigned int cur = dst->id();
+  std::vector<Route*> route_stack;
+  unsigned long cur = dst->id();
   do {
-    int pred = TO_FLOYD_PRED(src->id(), cur);
+    long pred = predecessor_table_[src->id()][cur];
     if (pred == -1)
-      THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname());
-    route_stack.push_back(TO_FLOYD_LINK(pred, cur));
+      throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname()));
+    route_stack.push_back(link_table_[pred][cur].get());
     cur = pred;
   } while (cur != src->id());
 
-  if (hierarchy_ == RoutingMode::recursive) {
-    route->gw_src = route_stack.back()->gw_src;
-    route->gw_dst = route_stack.front()->gw_dst;
+  if (get_hierarchy() == RoutingMode::recursive) {
+    route->gw_src_ = route_stack.back()->gw_src_;
+    route->gw_dst_ = route_stack.front()->gw_dst_;
   }
 
-  sg_netpoint_t prev_dst_gw = nullptr;
+  const NetPoint* prev_dst_gw = nullptr;
   while (not route_stack.empty()) {
-    sg_platf_route_cbarg_t e_route = route_stack.back();
+    const Route* e_route = route_stack.back();
     route_stack.pop_back();
-    if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr &&
-        prev_dst_gw->getCname() != e_route->gw_src->getCname()) {
-      getGlobalRoute(prev_dst_gw, e_route->gw_src, route->link_list, lat);
+    if (get_hierarchy() == RoutingMode::recursive && prev_dst_gw != nullptr &&
+        prev_dst_gw->get_cname() != e_route->gw_src_->get_cname()) {
+      get_global_route(prev_dst_gw, e_route->gw_src_, route->link_list_, lat);
     }
 
-    for (auto const& link : *e_route->link_list) {
-      route->link_list->push_back(link);
-      if (lat)
-        *lat += link->latency();
-    }
+    add_link_latency(route->link_list_, e_route->link_list_, lat);
 
-    prev_dst_gw = e_route->gw_dst;
+    prev_dst_gw = e_route->gw_dst_;
   }
 }
 
-void FloydZone::addRoute(sg_platf_route_cbarg_t route)
+void FloydZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst,
+                          const std::vector<s4u::LinkInRoute>& link_list, bool symmetrical)
 {
   /* set the size of table routing */
-  unsigned int table_size = getTableSize();
-
-  addRouteCheckParams(route);
-
-  if (not linkTable_) {
-    /* Create Cost, Predecessor and Link tables */
-    costTable_        = new double[table_size * table_size];                 /* link cost from host to host */
-    predecessorTable_ = new int[table_size * table_size];                    /* predecessor host numbers */
-    linkTable_        = new sg_platf_route_cbarg_t[table_size * table_size]; /* actual link between src and dst */
-
-    /* Initialize costs and predecessors */
-    for (unsigned int i = 0; i < table_size; i++)
-      for (unsigned int j = 0; j < table_size; j++) {
-        TO_FLOYD_COST(i, j) = DBL_MAX;
-        TO_FLOYD_PRED(i, j) = -1;
-        TO_FLOYD_LINK(i, j) = nullptr;
-      }
-  }
+  unsigned int table_size = get_table_size();
+  init_tables(table_size);
+
+  add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical);
 
   /* Check that the route does not already exist */
-  if (route->gw_dst) // netzone route (to adapt the error message, if any)
-    xbt_assert(nullptr == TO_FLOYD_LINK(route->src->id(), route->dst->id()),
+  if (gw_dst && gw_src) // netzone route (to adapt the error message, if any)
+    xbt_assert(nullptr == link_table_[src->id()][dst->id()],
                "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).",
-               route->src->getCname(), route->gw_src->getCname(), route->dst->getCname(), route->gw_dst->getCname());
+               src->get_cname(), gw_src->get_cname(), dst->get_cname(), gw_dst->get_cname());
   else
-    xbt_assert(nullptr == TO_FLOYD_LINK(route->src->id(), route->dst->id()),
-               "The route between %s and %s already exists (Rq: routes are symmetrical by default).",
-               route->src->getCname(), route->dst->getCname());
+    xbt_assert(nullptr == link_table_[src->id()][dst->id()],
+               "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->get_cname(),
+               dst->get_cname());
 
-  TO_FLOYD_LINK(route->src->id(), route->dst->id()) = newExtendedRoute(hierarchy_, route, 1);
-  TO_FLOYD_PRED(route->src->id(), route->dst->id()) = route->src->id();
-  TO_FLOYD_COST(route->src->id(), route->dst->id()) =
-      (TO_FLOYD_LINK(route->src->id(), route->dst->id()))->link_list->size();
+  link_table_[src->id()][dst->id()] = std::unique_ptr<Route>(
+      new_extended_route(get_hierarchy(), gw_src, gw_dst, get_link_list_impl(link_list, false), true));
+  predecessor_table_[src->id()][dst->id()] = src->id();
+  cost_table_[src->id()][dst->id()]        = link_table_[src->id()][dst->id()]->link_list_.size();
 
-  if (route->symmetrical == true) {
-    if (route->gw_dst) // netzone route (to adapt the error message, if any)
+  if (symmetrical) {
+    if (gw_dst && gw_src) // netzone route (to adapt the error message, if any)
       xbt_assert(
-          nullptr == TO_FLOYD_LINK(route->dst->id(), route->src->id()),
+          nullptr == link_table_[dst->id()][src->id()],
           "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.",
-          route->dst->getCname(), route->gw_dst->getCname(), route->src->getCname(), route->gw_src->getCname());
+          dst->get_cname(), gw_dst->get_cname(), src->get_cname(), gw_src->get_cname());
     else
-      xbt_assert(nullptr == TO_FLOYD_LINK(route->dst->id(), route->src->id()),
+      xbt_assert(nullptr == link_table_[dst->id()][src->id()],
                  "The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
-                 route->dst->getCname(), route->src->getCname());
+                 dst->get_cname(), src->get_cname());
 
-    if (route->gw_dst && route->gw_src) {
-      NetPoint* gw_tmp = route->gw_src;
-      route->gw_src   = route->gw_dst;
-      route->gw_dst   = gw_tmp;
+    if (gw_dst && gw_src) {
+      NetPoint* gw_tmp = gw_src;
+      gw_src           = gw_dst;
+      gw_dst           = gw_tmp;
     }
 
-    if (not route->gw_src || not route->gw_dst)
-      XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->getCname(), route->src->getCname());
+    if (not gw_src || not gw_dst)
+      XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->get_cname(), src->get_cname());
     else
-      XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", route->dst->getCname(), route->gw_src->getCname(),
-                route->src->getCname(), route->gw_dst->getCname());
-
-    TO_FLOYD_LINK(route->dst->id(), route->src->id()) = newExtendedRoute(hierarchy_, route, 0);
-    TO_FLOYD_PRED(route->dst->id(), route->src->id()) = route->dst->id();
-    TO_FLOYD_COST(route->dst->id(), route->src->id()) =
-        (TO_FLOYD_LINK(route->dst->id(), route->src->id()))->link_list->size(); /* count of links, old model assume 1 */
+      XBT_DEBUG("Load NetzoneRoute from \"%s(%s)\" to \"%s(%s)\"", dst->get_cname(), gw_src->get_cname(),
+                src->get_cname(), gw_dst->get_cname());
+
+    link_table_[dst->id()][src->id()] = std::unique_ptr<Route>(
+        new_extended_route(get_hierarchy(), gw_src, gw_dst, get_link_list_impl(link_list, true), false));
+    predecessor_table_[dst->id()][src->id()] = dst->id();
+    cost_table_[dst->id()][src->id()] =
+        link_table_[dst->id()][src->id()]->link_list_.size(); /* count of links, old model assume 1 */
   }
 }
 
-void FloydZone::seal()
+void FloydZone::do_seal()
 {
   /* set the size of table routing */
-  unsigned int table_size = getTableSize();
-
-  if (not linkTable_) {
-    /* Create Cost, Predecessor and Link tables */
-    costTable_        = new double[table_size * table_size];                 /* link cost from host to host */
-    predecessorTable_ = new int[table_size * table_size];                    /* predecessor host numbers */
-    linkTable_        = new sg_platf_route_cbarg_t[table_size * table_size]; /* actual link between src and dst */
-
-    /* Initialize costs and predecessors */
-    for (unsigned int i = 0; i < table_size; i++)
-      for (unsigned int j = 0; j < table_size; j++) {
-        TO_FLOYD_COST(i, j) = DBL_MAX;
-        TO_FLOYD_PRED(i, j) = -1;
-        TO_FLOYD_LINK(i, j) = nullptr;
-      }
-  }
+  unsigned int table_size = get_table_size();
+  init_tables(table_size);
 
   /* Add the loopback if needed */
-  if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) {
+  if (get_network_model()->loopback_ && get_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 (not e_route) {
-        e_route            = new s_sg_platf_route_cbarg_t;
-        e_route->gw_src    = nullptr;
-        e_route->gw_dst    = nullptr;
-        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;
-        TO_FLOYD_COST(i, i) = 1;
+      auto& route = link_table_[i][i];
+      if (not route) {
+        route.reset(new Route());
+        route->link_list_.push_back(get_network_model()->loopback_.get());
+        predecessor_table_[i][i] = i;
+        cost_table_[i][i]        = 1;
       }
     }
   }
@@ -191,17 +144,22 @@ void FloydZone::seal()
   for (unsigned int c = 0; c < table_size; c++) {
     for (unsigned int a = 0; a < table_size; a++) {
       for (unsigned int b = 0; b < table_size; b++) {
-        if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) {
-          if (fabs(TO_FLOYD_COST(a, b) - DBL_MAX) < std::numeric_limits<double>::epsilon() ||
-              (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) < TO_FLOYD_COST(a, b))) {
-            TO_FLOYD_COST(a, b) = TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b);
-            TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b);
-          }
+        if (cost_table_[a][c] < ULONG_MAX && cost_table_[c][b] < ULONG_MAX &&
+            (cost_table_[a][b] == ULONG_MAX || (cost_table_[a][c] + cost_table_[c][b] < cost_table_[a][b]))) {
+          cost_table_[a][b]        = cost_table_[a][c] + cost_table_[c][b];
+          predecessor_table_[a][b] = predecessor_table_[c][b];
         }
       }
     }
   }
 }
+} // namespace kernel::routing
+
+namespace s4u {
+NetZone* create_floyd_zone(const std::string& name)
+{
+  return (new kernel::routing::FloydZone(name))->get_iface();
 }
-}
-}
+} // namespace s4u
+
+} // namespace simgrid