s/NULL/nullptr/ in our C++ codebase

[simgrid.git] / src / surf / AsFloyd.cpp

diff --git a/src/surf/AsFloyd.cpp b/src/surf/AsFloyd.cpp
index 6f215c5..7949cf2 100644 (file)
--- a/src/surf/AsFloyd.cpp
+++ b/src/surf/AsFloyd.cpp
@@ -15,20 +15,20 @@ 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?
+  if (linkTable_ == nullptr) // Dealing with a parse error in the file?
     return;
   /* Delete link_table */
   for (i = 0; i < table_size; i++)
@@ -47,7 +47,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,16 +63,16 @@ 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())) {
-      routing_platf->getRouteAndLatency(prev_dst_gw, e_route->gw_src, &route->link_list, lat);
+    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);
     }
 
-    for (auto link: e_route->link_list) {
-      route->link_list.push_back(link);
+    for (auto link: *e_route->link_list) {
+      route->link_list->push_back(link);
       if (lat)
         *lat += link->getLatency();
     }
@@ -87,9 +87,6 @@ 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);
-
   addRouteCheckParams(route);
 
   if(!linkTable_) {
@@ -103,33 +100,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 +135,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 +162,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,9 +172,10 @@ 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->link_list.push_back(routing_platf->loopback_);
+        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;
         TO_FLOYD_PRED(i, i) = i;
         TO_FLOYD_COST(i, i) = 1;