yes, why?

[simgrid.git] / src / simdag / sd_workstation.cpp

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index 06eb2bd..d37cead 100644 (file)
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -12,7 +12,6 @@
 #include "xbt/lib.h"
 #include "xbt/sysdep.h"
 #include "surf/surf.h"
-#include "simgrid/msg.h" //FIXME: why?
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_workstation, sd,
                                 "Logging specific to SimDag (workstation)");
@@ -175,8 +174,8 @@ void SD_workstation_dump(SD_workstation_t ws)
   SD_task_t task = NULL;
   
   XBT_INFO("Displaying workstation %s", SD_workstation_get_name(ws));
-  XBT_INFO("  - power: %.0f", SD_workstation_get_power(ws));
-  XBT_INFO("  - available power: %.2f", SD_workstation_get_available_power(ws));
+  XBT_INFO("  - speed: %.0f", SD_workstation_get_speed(ws));
+  XBT_INFO("  - available speed: %.2f", SD_workstation_get_available_speed(ws));
   switch (sg_host_sd(ws)->access_mode){
   case SD_WORKSTATION_SHARED_ACCESS:
       XBT_INFO("  - access mode: Space shared");
@@ -222,7 +221,7 @@ const SD_link_t *SD_route_get_list(SD_workstation_t src,
 
   if (sd_global->recyclable_route == NULL) {
     /* first run */
-    sd_global->recyclable_route = xbt_new(SD_link_t, SD_link_get_count());
+    sd_global->recyclable_route = xbt_new(SD_link_t, sg_link_count());
   }
 
   surf_route = surf_host_model_get_route((surf_host_model_t)surf_host_model, src, dst);
@@ -248,13 +247,13 @@ int SD_route_get_size(SD_workstation_t src, SD_workstation_t dst)
 }
 
 /**
- * \brief Returns the total power of a workstation
+ * \brief Returns the total speed of a workstation
  *
  * \param workstation a workstation
- * \return the total power of this workstation
- * \see SD_workstation_get_available_power()
+ * \return the total speed of this workstation
+ * \see SD_workstation_get_available_speed()
  */
-double SD_workstation_get_power(SD_workstation_t workstation)
+double SD_workstation_get_speed(SD_workstation_t workstation)
 {
   return workstation->speed();
 }
@@ -269,13 +268,13 @@ int SD_workstation_get_cores(SD_workstation_t workstation) {
 }
 
 /**
- * \brief Returns the proportion of available power in a workstation
+ * \brief Returns the proportion of available speed in a workstation
  *
  * \param workstation a workstation
- * \return the proportion of power currently available in this workstation (normally a number between 0 and 1)
- * \see SD_workstation_get_power()
+ * \return the proportion of speed currently available in this workstation (normally a number between 0 and 1)
+ * \see SD_workstation_get_speed()
  */
-double SD_workstation_get_available_power(SD_workstation_t workstation)
+double SD_workstation_get_available_speed(SD_workstation_t workstation)
 {
   return surf_host_get_available_speed(workstation);
 }
@@ -292,7 +291,7 @@ double SD_workstation_get_computation_time(SD_workstation_t workstation,
 {
   xbt_assert(flops_amount >= 0,
               "flops_amount must be greater than or equal to zero");
-  return flops_amount / SD_workstation_get_power(workstation);
+  return flops_amount / SD_workstation_get_speed(workstation);
 }
 
 /**
@@ -306,7 +305,7 @@ double SD_workstation_get_computation_time(SD_workstation_t workstation,
 double SD_route_get_latency(SD_workstation_t src, SD_workstation_t dst)
 {
   xbt_dynar_t route = NULL;
-  double latency;
+  double latency = 0;
 
   routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard,
                                     &route, &latency);
@@ -338,7 +337,7 @@ double SD_route_get_bandwidth(SD_workstation_t src, SD_workstation_t dst)
   min_bandwidth = -1.0;
 
   for (i = 0; i < nb_links; i++) {
-    bandwidth = SD_link_get_bandwidth(links[i]);
+    bandwidth = sg_link_bandwidth(links[i]);
     if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
       min_bandwidth = bandwidth;
   }
@@ -369,7 +368,7 @@ double SD_route_get_communication_time(SD_workstation_t src,
   xbt_dynar_t route = NULL;
   int nb_links;
   double bandwidth, min_bandwidth;
-  double latency;
+  double latency = 0;
   int i;
 
   xbt_assert(bytes_amount >= 0, "bytes_amount must be greater than or equal to zero");
@@ -386,7 +385,7 @@ double SD_route_get_communication_time(SD_workstation_t src,
   min_bandwidth = -1.0;
 
   for (i = 0; i < nb_links; i++) {
-    bandwidth = SD_link_get_bandwidth(links[i]);
+    bandwidth = sg_link_bandwidth(links[i]);
     if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
       min_bandwidth = bandwidth;
   }