X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba9a4cfeba4eb00e84cd17603fc9654e81445655..a1a92bc75727d71de12ad470b271b6a973d31275:/src/simdag/sd_workstation.cpp
diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index e77d274f80..44e2a0bdaf 100644
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -4,8 +4,9 @@
/* 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/simdag/simdag_private.h"
#include "simgrid/s4u/host.hpp"
+
+#include "simdag_private.hpp"
#include "src/surf/HostImpl.hpp"
#include "surf/surf.h"
@@ -20,15 +21,16 @@
*/
SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst)
{
- void *surf_link;
- unsigned int cpt;
- xbt_dynar_t surf_route = NULL;
- routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &surf_route, NULL);
+ std::vector *route = new std::vector();
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
- SD_link_t *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;
}
@@ -42,9 +44,11 @@ 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)
{
- xbt_dynar_t surf_route = NULL;
- routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &surf_route, NULL);
- return xbt_dynar_length(surf_route);
+ std::vector *route = new std::vector();
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
+ int size = route->size();
+ delete route;
+ return size;
}
/**
@@ -57,10 +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 *route = new std::vector();
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, &latency);
+ delete route;
return latency;
}
@@ -76,19 +80,17 @@ double SD_route_get_latency(sg_host_t src, sg_host_t dst)
*/
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 min_bandwidth = -1.0;
- SD_link_t link;
- routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, &latency);
+ std::vector *route = new std::vector();
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
- xbt_dynar_foreach(route, cpt, link){
+ for (auto link : *route) {
double bandwidth = sg_link_bandwidth(link);
- if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
+ if (bandwidth < min_bandwidth || min_bandwidth < 0.0)
min_bandwidth = bandwidth;
}
+ delete route;
return min_bandwidth;
}