Merge pull request #181 from bcamus/master

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

diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp
index 1d0207b..c8d4bae 100644 (file)
--- a/src/kernel/routing/RoutedZone.cpp
+++ b/src/kernel/routing/RoutedZone.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-2017. 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. */
@@ -29,13 +29,12 @@ void routing_route_free(sg_platf_route_cbarg_t route)
 static const char* instr_node_name(xbt_node_t node)
 {
   void* data = xbt_graph_node_get_data(node);
-  char* str  = (char*)data;
-  return str;
+  return static_cast<const char*>(data);
 }
 
 xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name, xbt_dict_t nodes)
 {
-  xbt_node_t ret = (xbt_node_t)xbt_dict_get_or_null(nodes, name);
+  xbt_node_t ret = static_cast<xbt_node_t>(xbt_dict_get_or_null(nodes, name));
   if (ret)
     return ret;
 
@@ -48,21 +47,18 @@ xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt
 {
   const char* sn = instr_node_name(s);
   const char* dn = instr_node_name(d);
-  int len        = strlen(sn) + strlen(dn) + 1;
-  char* name     = (char*)xbt_malloc(len * sizeof(char));
+  std::string name = std::string(sn) + dn;
 
-  snprintf(name, len, "%s%s", sn, dn);
-  xbt_edge_t ret = (xbt_edge_t)xbt_dict_get_or_null(edges, name);
+  xbt_edge_t ret = static_cast<xbt_edge_t>(xbt_dict_get_or_null(edges, name.c_str()));
   if (ret == nullptr) {
-    snprintf(name, len, "%s%s", dn, sn);
-    ret = (xbt_edge_t)xbt_dict_get_or_null(edges, name);
+    name = std::string(dn) + sn;
+    ret  = static_cast<xbt_edge_t>(xbt_dict_get_or_null(edges, name.c_str()));
   }
 
   if (ret == nullptr) {
     ret = xbt_graph_new_edge(graph, s, d, nullptr);
-    xbt_dict_set(edges, name, ret, nullptr);
+    xbt_dict_set(edges, name.c_str(), ret, nullptr);
   }
-  free(name);
   return ret;
 }
 
@@ -88,8 +84,10 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
 
       XBT_DEBUG("get_route_and_latency %s -> %s", my_src->cname(), my_dst->cname());
 
-      xbt_node_t current, previous;
-      const char *previous_name, *current_name;
+      xbt_node_t current;
+      xbt_node_t previous;
+      const char *previous_name;
+      const char *current_name;
 
       if (route->gw_src) {
         previous      = new_xbt_graph_node(graph, route->gw_src->cname(), nodes);
@@ -180,15 +178,17 @@ void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
   const char* srcName = src->cname();
   const char* dstName = dst->cname();
 
-  if (!route->gw_dst && !route->gw_src) {
+  if (not route->gw_dst && not route->gw_src) {
     XBT_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName);
     xbt_assert(src, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, srcName);
     xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName);
-    xbt_assert(!route->link_list->empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName);
-    xbt_assert(!src->isNetZone(),
-               "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?", srcName);
-    xbt_assert(!dst->isNetZone(),
-               "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?", dstName);
+    xbt_assert(not route->link_list->empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName);
+    xbt_assert(not src->isNetZone(),
+               "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?",
+               srcName);
+    xbt_assert(not dst->isNetZone(),
+               "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?",
+               dstName);
   } else {
     XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, route->gw_src->cname(), dstName, route->gw_dst->cname());
     xbt_assert(src->isNetZone(), "When defining a NetzoneRoute, src must be a netzone but '%s' is not", srcName);
@@ -205,7 +205,7 @@ void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
                dstName, route->gw_dst->cname(), srcName);
     xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->cname(),
                dstName, route->gw_dst->cname(), dstName);
-    xbt_assert(!route->link_list->empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName,
+    xbt_assert(not route->link_list->empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName,
                route->gw_src->cname(), dstName, route->gw_dst->cname());
   }