Explain how to maintain the spack package for simgrid

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

diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp
index e655edd..dab2e4e 100644 (file)
--- a/src/kernel/routing/RoutedZone.cpp
+++ b/src/kernel/routing/RoutedZone.cpp
@@ -14,14 +14,6 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
 
-void routing_route_free(sg_platf_route_cbarg_t route)
-{
-  if (route) {
-    delete route->link_list;
-    delete route;
-  }
-}
-
 /* ***************************************************************** */
 /* *********************** GENERIC METHODS ************************* */
 
@@ -31,34 +23,36 @@ static const char* instr_node_name(xbt_node_t node)
   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 new_xbt_graph_node(xbt_graph_t graph, const char* name, std::map<std::string, xbt_node_t>* nodes)
 {
-  xbt_node_t ret = static_cast<xbt_node_t>(xbt_dict_get_or_null(nodes, name));
-  if (ret)
-    return ret;
 
-  ret = xbt_graph_new_node(graph, xbt_strdup(name));
-  xbt_dict_set(nodes, name, ret, nullptr);
-  return ret;
+  auto elm = nodes->find(name);
+  if (elm == nodes->end()) {
+    xbt_node_t ret = xbt_graph_new_node(graph, xbt_strdup(name));
+    nodes->insert({name, ret});
+    return ret;
+  } else
+    return elm->second;
 }
 
-xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges)
+xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, std::map<std::string, xbt_edge_t>* edges)
 {
   const char* sn = instr_node_name(s);
   const char* dn = instr_node_name(d);
   std::string name = std::string(sn) + dn;
 
-  xbt_edge_t ret = static_cast<xbt_edge_t>(xbt_dict_get_or_null(edges, name.c_str()));
-  if (ret == nullptr) {
+  auto elm = edges->find(name);
+  if (elm == edges->end()) {
     name = std::string(dn) + sn;
-    ret  = static_cast<xbt_edge_t>(xbt_dict_get_or_null(edges, name.c_str()));
+    elm  = edges->find(name);
   }
 
-  if (ret == nullptr) {
-    ret = xbt_graph_new_edge(graph, s, d, nullptr);
-    xbt_dict_set(edges, name.c_str(), ret, nullptr);
-  }
-  return ret;
+  if (elm == edges->end()) {
+    xbt_edge_t ret = xbt_graph_new_edge(graph, s, d, nullptr);
+    edges->insert({name, ret});
+    return ret;
+  } else
+    return elm->second;
 }
 
 namespace simgrid {
@@ -69,7 +63,8 @@ RoutedZone::RoutedZone(NetZone* father, std::string name) : NetZoneImpl(father,
 {
 }
 
-void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
+void RoutedZone::getGraph(xbt_graph_t graph, std::map<std::string, xbt_node_t>* nodes,
+                          std::map<std::string, xbt_edge_t>* edges)
 {
   std::vector<kernel::routing::NetPoint*> vertices = getVertices();
 
@@ -79,7 +74,6 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
         continue;
 
       sg_platf_route_cbarg_t route = new s_sg_platf_route_cbarg_t;
-      route->link_list             = new std::vector<surf::LinkImpl*>();
 
       getLocalRoute(my_src, my_dst, route, nullptr);
 
@@ -98,8 +92,8 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
         previous_name = my_src->getCname();
       }
 
-      for (auto const& link : *route->link_list) {
-        const char* link_name = link->cname();
+      for (auto const& link : route->link_list) {
+        const char* link_name = link->getCname();
         current               = new_xbt_graph_node(graph, link_name, nodes);
         current_name          = link_name;
         new_xbt_graph_edge(graph, previous, current, edges);
@@ -118,7 +112,6 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
       new_xbt_graph_edge(graph, previous, current, edges);
       XBT_DEBUG("  %s -> %s", previous_name, current_name);
 
-      delete route->link_list;
       delete route;
     }
   }
@@ -133,7 +126,6 @@ sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
   sg_platf_route_cbarg_t result;
 
   result            = new s_sg_platf_route_cbarg_t;
-  result->link_list = new std::vector<surf::LinkImpl*>();
 
   xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive,
              "The hierarchy of this netzone is neither BASIC nor RECURSIVE, I'm lost here.");
@@ -145,13 +137,13 @@ sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl
     result->gw_dst = routearg->gw_dst;
   }
 
-  for (auto const& link : *routearg->link_list) {
+  for (auto const& link : routearg->link_list) {
     if (change_order)
-      result->link_list->push_back(link);
+      result->link_list.push_back(link);
     else
-      result->link_list->insert(result->link_list->begin(), link);
+      result->link_list.insert(result->link_list.begin(), link);
   }
-  result->link_list->shrink_to_fit();
+  result->link_list.shrink_to_fit();
 
   return result;
 }
@@ -183,7 +175,7 @@ void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
     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(not route->link_list->empty(), "Empty route (between %s and %s) forbidden.", srcName, 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);
@@ -208,7 +200,7 @@ void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
                dstName, route->gw_dst->getCname(), srcName);
     xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->getCname(),
                dstName, route->gw_dst->getCname(), dstName);
-    xbt_assert(not 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->getCname(), dstName, route->gw_dst->getCname());
   }