X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7571100729971aa089eb33af2f93a5177fc83757..9fc66c42a83d33d9b0a10c120228c84406755845:/src/simdag/sd_workstation.cpp

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index ac0bdb4e71..d40c185eb6 100644
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -210,7 +210,7 @@ void SD_workstation_dump(SD_workstation_t ws)
  *
  * \param src a workstation
  * \param dst another workstation
- * \return a new array of \ref SD_link_t representating the route between these two workstations
+ * \return a new array of \ref SD_link_t representing the route between these two workstations
  * \see SD_route_get_size(), SD_link_t
  */
 const SD_link_t *SD_route_get_list(SD_workstation_t src,
@@ -296,30 +296,20 @@ double SD_workstation_get_computation_time(SD_workstation_t workstation,
 }
 
 /**
- * \brief Returns the latency of the route between two workstations, i.e. the sum of all link latencies
- * between the workstations.
+ * \brief Returns the latency of the route between two workstations.
  *
  * \param src the first workstation
  * \param dst the second workstation
  * \return the latency of the route between the two workstations (in seconds)
  * \see SD_route_get_current_bandwidth()
  */
-double SD_route_get_current_latency(SD_workstation_t src,
-                                    SD_workstation_t dst)
+double SD_route_get_current_latency(SD_workstation_t src, SD_workstation_t dst)
 {
-
-  const SD_link_t *links;
-  int nb_links;
+  xbt_dynar_t route = NULL;
   double latency;
-  int i;
 
-  links = SD_route_get_list(src, dst);
-  nb_links = SD_route_get_size(src, dst);
-  latency = 0.0;
-
-  for (i = 0; i < nb_links; i++) {
-    latency += SD_link_get_current_latency(links[i]);
-  }
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard,
+                                    &route, &latency);
 
   return latency;
 }
@@ -376,6 +366,7 @@ double SD_route_get_communication_time(SD_workstation_t src,
      transmission time of a link = communication amount / link bandwidth */
 
   const SD_link_t *links;
+  xbt_dynar_t route = NULL;
   int nb_links;
   double bandwidth, min_bandwidth;
   double latency;
@@ -387,13 +378,14 @@ double SD_route_get_communication_time(SD_workstation_t src,
   if (bytes_amount == 0.0)
     return 0.0;
 
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard,
+                                    &route, &latency);
+
   links = SD_route_get_list(src, dst);
   nb_links = SD_route_get_size(src, dst);
   min_bandwidth = -1.0;
-  latency = 0;
 
   for (i = 0; i < nb_links; i++) {
-    latency += SD_link_get_current_latency(links[i]);
     bandwidth = SD_link_get_current_bandwidth(links[i]);
     if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
       min_bandwidth = bandwidth;