X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1aeee3ce2981cd8db039d6be8f5b86e88eabb704..a1a92bc75727d71de12ad470b271b6a973d31275:/src/simdag/sd_workstation.cpp

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index 8f9cef43b7..44e2a0bdaf 100644
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -4,14 +4,10 @@
 /* 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 "src/surf/host_interface.hpp"
-#include "src/simdag/simdag_private.h"
-#include "simgrid/simdag.h"
-#include "simgrid/host.h"
-#include <simgrid/s4u/host.hpp>
-#include "xbt/dict.h"
-#include "xbt/lib.h"
-#include "xbt/sysdep.h"
+#include "simgrid/s4u/host.hpp"
+
+#include "simdag_private.hpp"
+#include "src/surf/HostImpl.hpp"
 #include "surf/surf.h"
 
 /** @brief Returns the route between two workstations
@@ -23,19 +19,18 @@
  * \return an array of the \ref SD_link_t composing the route
  * \see SD_route_get_size(), SD_link_t
  */
-const SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst)
+SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst)
 {
-  xbt_dynar_t surf_route;
-  SD_link_t* list;
-  void *surf_link;
-  unsigned int cpt;
-  surf_route = surf_host_model_get_route((surf_host_model_t)surf_host_model,
-                                         src, dst);
+  std::vector<Link*> *route = new std::vector<Link*>();
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
 
-  list = xbt_new(SD_link_t, xbt_dynar_length(surf_route));
-  xbt_dynar_foreach(surf_route, cpt, surf_link) {
-    list[cpt] = (SD_link_t)surf_link;
+  int cpt=0;
+  SD_link_t *list = xbt_new(SD_link_t, route->size());
+  for (auto link : *route){
+    list[cpt] = link;
+    cpt++;
   }
+  delete route;
   return list;
 }
 
@@ -49,8 +44,11 @@ const SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst)
  */
 int SD_route_get_size(sg_host_t src, sg_host_t dst)
 {
-  return xbt_dynar_length(surf_host_model_get_route(
-      (surf_host_model_t)surf_host_model, src, dst));
+  std::vector<Link*> *route = new std::vector<Link*>();
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
+  int size = route->size();
+  delete route;
+  return size;
 }
 
 /**
@@ -63,11 +61,10 @@ int SD_route_get_size(sg_host_t src, sg_host_t dst)
  */
 double SD_route_get_latency(sg_host_t src, sg_host_t dst)
 {
-  xbt_dynar_t route = NULL;
   double latency = 0;
-
-  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard,
-                                    &route, &latency);
+  std::vector<Link*> *route = new std::vector<Link*>();
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, &latency);
+  delete route;
 
   return latency;
 }
@@ -78,27 +75,22 @@ double SD_route_get_latency(sg_host_t src, sg_host_t dst)
  *
  * \param src the first workstation
  * \param dst the second workstation
- * \return the bandwidth of the route between the two workstations
- * (in bytes/second)
+ * \return the bandwidth of the route between the two workstations (in bytes/second)
  * \see SD_route_get_latency()
  */
 double SD_route_get_bandwidth(sg_host_t src, sg_host_t dst)
 {
-  xbt_dynar_t route = NULL;
-  unsigned int cpt;
-  double latency = 0;
-  double bandwidth;
   double min_bandwidth = -1.0;
-  SD_link_t link;
 
-  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard,
-                                    &route, &latency);
+  std::vector<Link*> *route = new std::vector<Link*>();
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
 
-  xbt_dynar_foreach(route, cpt, link){
-    bandwidth = sg_link_bandwidth(link);
-    if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
+  for (auto link : *route) {
+    double bandwidth = sg_link_bandwidth(link);
+    if (bandwidth < min_bandwidth || min_bandwidth < 0.0)
       min_bandwidth = bandwidth;
   }
+  delete route;
 
   return min_bandwidth;
 }