X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/97fa57103ccd60e8fc4c04ea6591904a7600a679..a056732695cac7f3c0b79a127edfdf0023ccd537:/src/surf/AsFloyd.cpp

diff --git a/src/surf/AsFloyd.cpp b/src/surf/AsFloyd.cpp
index 960b039f34..8c835e51e4 100644
--- a/src/surf/AsFloyd.cpp
+++ b/src/surf/AsFloyd.cpp
@@ -15,24 +15,23 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf");
 #define TO_FLOYD_LINK(i,j) (linkTable_)[(i)+(j)*table_size]
 
 namespace simgrid {
-namespace surf {
+namespace routing {
 
 AsFloyd::AsFloyd(const char*name)
   : AsRoutedGraph(name)
 {
-  predecessorTable_ = NULL;
-  costTable_ = NULL;
-  linkTable_ = NULL;
+  predecessorTable_ = nullptr;
+  costTable_ = nullptr;
+  linkTable_ = nullptr;
 }
 
 AsFloyd::~AsFloyd(){
-  int i, j;
-  int table_size = (int)xbt_dynar_length(vertices_);
-  if (linkTable_ == NULL) // Dealing with a parse error in the file?
+  int table_size = static_cast<int>(xbt_dynar_length(vertices_));
+  if (linkTable_ == nullptr) // Dealing with a parse error in the file?
     return;
   /* Delete link_table */
-  for (i = 0; i < table_size; i++)
-    for (j = 0; j < table_size; j++)
+  for (int i = 0; i < table_size; i++)
+    for (int j = 0; j < table_size; j++)
       routing_route_free(TO_FLOYD_LINK(i, j));
   xbt_free(linkTable_);
 
@@ -47,7 +46,7 @@ void AsFloyd::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbar
   getRouteCheckParams(src, dst);
 
   /* create a result route */
-  xbt_dynar_t route_stack = xbt_dynar_new(sizeof(sg_platf_route_cbarg_t), NULL);
+  xbt_dynar_t route_stack = xbt_dynar_new(sizeof(sg_platf_route_cbarg_t), nullptr);
   int pred;
   int cur = dst->id();
   do {
@@ -63,11 +62,11 @@ void AsFloyd::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbar
     route->gw_dst = xbt_dynar_getfirst_as(route_stack, sg_platf_route_cbarg_t)->gw_dst;
   }
 
-  sg_netcard_t prev_dst_gw = NULL;
+  sg_netcard_t prev_dst_gw = nullptr;
   while (!xbt_dynar_is_empty(route_stack)) {
     sg_platf_route_cbarg_t e_route = xbt_dynar_pop_as(route_stack, sg_platf_route_cbarg_t);
 
-    if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != NULL && strcmp(prev_dst_gw->name(), e_route->gw_src->name())) {
+    if (hierarchy_ == RoutingMode::recursive && prev_dst_gw != nullptr && strcmp(prev_dst_gw->name(), e_route->gw_src->name())) {
       routing_platf->getRouteAndLatency(prev_dst_gw, e_route->gw_src, route->link_list, lat);
     }
 
@@ -85,10 +84,7 @@ void AsFloyd::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbar
 void AsFloyd::addRoute(sg_platf_route_cbarg_t route)
 {
   /* set the size of table routing */
-  int table_size = (int)xbt_dynar_length(vertices_);
-
-  NetCard *src = sg_netcard_by_name_or_null(route->src);
-  NetCard *dst = sg_netcard_by_name_or_null(route->dst);
+  int table_size = static_cast<int>(xbt_dynar_length(vertices_));
 
   addRouteCheckParams(route);
 
@@ -103,33 +99,33 @@ void AsFloyd::addRoute(sg_platf_route_cbarg_t route)
       for (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) = NULL;
+        TO_FLOYD_LINK(i, j) = nullptr;
       }
   }
 
   /* Check that the route does not already exist */
   if (route->gw_dst) // AS route (to adapt the error message, if any)
-    xbt_assert(nullptr == TO_FLOYD_LINK(src->id(), dst->id()),
+    xbt_assert(nullptr == TO_FLOYD_LINK(route->src->id(), route->dst->id()),
         "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).",
-        src->name(),route->gw_src->name(),dst->name(),route->gw_dst->name());
+        route->src->name(),route->gw_src->name(),route->dst->name(),route->gw_dst->name());
   else
-    xbt_assert(nullptr == TO_FLOYD_LINK(src->id(), dst->id()),
-        "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->name(),dst->name());
+    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->name(),route->dst->name());
 
-  TO_FLOYD_LINK(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, 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();
+  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();
 
 
   if (route->symmetrical == true) {
     if (route->gw_dst) // AS route (to adapt the error message, if any)
-      xbt_assert(nullptr == TO_FLOYD_LINK(dst->id(), src->id()),
+      xbt_assert(nullptr == TO_FLOYD_LINK(route->dst->id(), route->src->id()),
           "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.",
-          dst->name(),route->gw_dst->name(),src->name(),route->gw_src->name());
+          route->dst->name(),route->gw_dst->name(),route->src->name(),route->gw_src->name());
     else
-      xbt_assert(nullptr == TO_FLOYD_LINK(dst->id(), src->id()),
+      xbt_assert(nullptr == TO_FLOYD_LINK(route->dst->id(), route->src->id()),
           "The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
-          dst->name(),src->name());
+          route->dst->name(),route->src->name());
 
     if(route->gw_dst && route->gw_src) {
       NetCard* gw_tmp = route->gw_src;
@@ -138,14 +134,14 @@ void AsFloyd::addRoute(sg_platf_route_cbarg_t route)
     }
 
     if(!route->gw_src && !route->gw_dst)
-      XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->name(), src->name());
+      XBT_DEBUG("Load Route from \"%s\" to \"%s\"", route->dst->name(), route->src->name());
     else
-      XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst->name(),
-          route->gw_src->name(), src->name(), route->gw_dst->name());
+      XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", route->dst->name(),
+          route->gw_src->name(), route->src->name(), route->gw_dst->name());
 
-    TO_FLOYD_LINK(dst->id(), src->id()) = newExtendedRoute(hierarchy_, route, 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 */
+    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 */
   }
 }
 
@@ -165,7 +161,7 @@ void AsFloyd::seal(){
       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) = NULL;
+        TO_FLOYD_LINK(i, j) = nullptr;
       }
   }
 
@@ -175,8 +171,8 @@ void AsFloyd::seal(){
       sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i);
       if (!e_route) {
         e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
-        e_route->gw_src = NULL;
-        e_route->gw_dst = NULL;
+        e_route->gw_src = nullptr;
+        e_route->gw_dst = nullptr;
         e_route->link_list = new std::vector<Link*>();
         e_route->link_list->push_back(routing_platf->loopback_);
         TO_FLOYD_LINK(i, i) = e_route;
@@ -190,11 +186,9 @@ void AsFloyd::seal(){
     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 (TO_FLOYD_COST(a, b) == DBL_MAX ||
-              (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);
+          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);
           }
         }