try to please clang by marking overriding methods accordingly

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

diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp
index cbea25d..de87cef 100644 (file)
--- a/src/kernel/routing/TorusZone.cpp
+++ b/src/kernel/routing/TorusZone.cpp
@@ -6,22 +6,22 @@
 #include "src/kernel/routing/TorusZone.hpp"
 #include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp"
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/split.hpp>
+#include <string>
+#include <vector>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster_torus, surf_route_cluster, "Torus Routing part of surf");
 
-inline unsigned int* rankId_to_coords(int rankId, std::vector<unsigned int> dimensions)
+inline void rankId_to_coords(int rankId, std::vector<unsigned int> dimensions, unsigned int (*coords)[4])
 {
-
   unsigned int dim_size_product = 1;
-  unsigned int* coords =  new unsigned int[dimensions.size()];
   unsigned int i = 0;
   for (auto cur_dim_size: dimensions) {
-    coords[i]    = (rankId / dim_size_product) % cur_dim_size;
+    (*coords)[i] = (rankId / dim_size_product) % cur_dim_size;
     dim_size_product *= cur_dim_size;
     i++;
   }
-
-  return coords;
 }
 
 namespace simgrid {
@@ -83,23 +83,20 @@ void TorusZone::create_links_for_node(sg_platf_cluster_cbarg_t cluster, int id,
 
 void TorusZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
 {
+  std::vector<std::string> dimensions;
+  boost::split(dimensions, cluster->topo_parameters, boost::is_any_of(","));
 
-  unsigned int iter;
-  char* groups;
-  xbt_dynar_t dimensions = xbt_str_split(cluster->topo_parameters, ",");
-
-  if (!xbt_dynar_is_empty(dimensions)) {
+  if (!dimensions.empty()) {
     /* We are in a torus cluster
      * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and safe it in a vector.
      * Additionally, we need to know how many ranks we have in total
      */
-    xbt_dynar_foreach (dimensions, iter, groups) {
-      dimensions_.push_back(surf_parse_get_int(groups));
+    for (auto group : dimensions) {
+      dimensions_.push_back(surf_parse_get_int(group.c_str()));
     }
 
     linkCountPerNode_ = dimensions_.size();
   }
-  xbt_dynar_free(&dimensions);
 }
 
 void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat)
@@ -133,8 +130,10 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
    * both arrays, we can easily assess whether we need to route
    * into this dimension or not.
    */
-  unsigned int* myCoords     = rankId_to_coords(src->id(), dimensions_);
-  unsigned int* targetCoords = rankId_to_coords(dst->id(), dimensions_);
+  unsigned int myCoords[4];
+  rankId_to_coords(src->id(), dimensions_, &myCoords);
+  unsigned int targetCoords[4];
+  rankId_to_coords(dst->id(), dimensions_, &targetCoords);
   /*
    * linkOffset describes the offset where the link
    * we want to use is stored
@@ -212,8 +211,6 @@ void TorusZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg
     current_node = next_node;
     next_node    = 0;
   }
-  delete[] myCoords;
-  delete[] targetCoords;
 }
 }
 }