Use boost instead of xbt in Vivaldi

diff --git a/src/kernel/routing/AsVivaldi.cpp b/src/kernel/routing/AsVivaldi.cpp
index 3d5add0..f54e508 100644 (file)
--- a/src/kernel/routing/AsVivaldi.cpp
+++ b/src/kernel/routing/AsVivaldi.cpp
@@ -1,9 +1,9 @@
-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved.         */
+/* Copyright (c) 2013-2016. 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. */
 
-#include <xbt/dynar.h>
+#include <boost/algorithm/string.hpp>
 
 #include <simgrid/s4u/host.hpp>
 
@@ -24,42 +24,34 @@ Coords::Coords(NetCard* netcard, const char* coordStr)
   if (!Coords::EXTENSION_ID.valid())
     Coords::EXTENSION_ID = NetCard::extension_create<Coords>();
 
-  unsigned int cursor;
-  char* str;
+  std::vector<std::string> string_values;
+  boost::split(string_values, coordStr, boost::is_any_of(" "));
+  xbt_assert(string_values.size() == 3, "Coordinates of %s must have 3 dimensions", netcard->cname());
 
-  xbt_dynar_t ctn_str = xbt_str_split_str(coordStr, " ");
-  xbt_assert(xbt_dynar_length(ctn_str) == 3, "Coordinates of %s must have 3 dimensions", netcard->cname());
+  for (auto str : string_values)
+    coords.push_back(xbt_str_parse_double(str.c_str(), "Invalid coordinate: %s"));
+  coords.shrink_to_fit();
 
-  this->coords = xbt_dynar_new(sizeof(double), nullptr);
-  xbt_dynar_foreach (ctn_str, cursor, str) {
-    double val = xbt_str_parse_double(str, "Invalid coordinate: %s");
-    xbt_dynar_push(this->coords, &val);
-  }
-  xbt_dynar_free(&ctn_str);
-  xbt_dynar_shrink(this->coords, 0);
   netcard->extension_set<Coords>(this);
   XBT_DEBUG("Coords of %s %p: %s", netcard->cname(), netcard, coordStr);
 }
-Coords::~Coords()
-{
-  xbt_dynar_free(&coords);
-}
+Coords::~Coords() = default;
 }; // namespace vivaldi
 
-static inline double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
+static inline double euclidean_dist_comp(int index, std::vector<double>* src, std::vector<double>* dst)
 {
-  double src_coord = xbt_dynar_get_as(src, index, double);
-  double dst_coord = xbt_dynar_get_as(dst, index, double);
+  double src_coord = src->at(index);
+  double dst_coord = dst->at(index);
 
   return (src_coord - dst_coord) * (src_coord - dst_coord);
 }
 
-static xbt_dynar_t getCoordsFromNetcard(NetCard* nc)
+static std::vector<double>* getCoordsFromNetcard(NetCard* nc)
 {
   simgrid::kernel::routing::vivaldi::Coords* coords = nc->extension<simgrid::kernel::routing::vivaldi::Coords>();
   xbt_assert(coords, "Please specify the Vivaldi coordinates of %s %s (%p)",
              (nc->isAS() ? "AS" : (nc->isHost() ? "Host" : "Router")), nc->cname(), nc);
-  return coords->coords;
+  return &coords->coords;
 }
 AsVivaldi::AsVivaldi(As* father, const char* name) : AsCluster(father, name)
 {
@@ -98,12 +90,12 @@ void AsVivaldi::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t
 
   /* Compute the extra latency due to the euclidean distance if needed */
   if (lat) {
-    xbt_dynar_t srcCoords = getCoordsFromNetcard(src);
-    xbt_dynar_t dstCoords = getCoordsFromNetcard(dst);
+    std::vector<double>* srcCoords = getCoordsFromNetcard(src);
+    std::vector<double>* dstCoords = getCoordsFromNetcard(dst);
 
     double euclidean_dist =
         sqrt(euclidean_dist_comp(0, srcCoords, dstCoords) + euclidean_dist_comp(1, srcCoords, dstCoords)) +
-        fabs(xbt_dynar_get_as(srcCoords, 2, double)) + fabs(xbt_dynar_get_as(dstCoords, 2, double));
+        fabs(srcCoords->at(2)) + fabs(dstCoords->at(2));
 
     XBT_DEBUG("Updating latency %f += %f", *lat, euclidean_dist);
     *lat += euclidean_dist / 1000.0; // From .ms to .s

diff --git a/src/kernel/routing/AsVivaldi.hpp b/src/kernel/routing/AsVivaldi.hpp
index 5b7f684..7e702d8 100644 (file)
--- a/src/kernel/routing/AsVivaldi.hpp
+++ b/src/kernel/routing/AsVivaldi.hpp
@@ -27,7 +27,7 @@ public:
   explicit Coords(NetCard* host, const char* str);
   virtual ~Coords();
 
-  xbt_dynar_t coords;
+  std::vector<double> coords;
 };
 }
 }