X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da3e3559ec1388c6b9c0335b1489a83ea7f1b58e..077972fd6355b0900d78e4ff0779cf58a5e10e71:/src/simdag/sd_workstation.cpp

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index 9b21a9a804..b617568d6e 100644
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -12,28 +12,10 @@
 #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)");
 
-/* Creates a workstation and registers it in SD.
- */
-SD_workstation_t __SD_workstation_create(const char *name)
-{
-
-  SD_workstation_priv_t workstation;
-
-  workstation = xbt_new(s_SD_workstation_priv_t, 1);
-  workstation->access_mode = SD_WORKSTATION_SHARED_ACCESS;      /* default mode is shared */
-  workstation->task_fifo = NULL;
-  workstation->current_task = NULL;
-
-  sg_host_t sg_host = sg_host_by_name(name);
-  sg_host_sd_set(sg_host,workstation);
-  return sg_host;
-}
-
 /* Creates a storage and registers it in SD.
  */
 SD_storage_t __SD_storage_create(void *surf_storage, void *data)
@@ -83,7 +65,7 @@ SD_workstation_t SD_workstation_get_by_name(const char *name)
  * \see SD_workstation_get_number()
  */
 const SD_workstation_t *SD_workstation_get_list(void) {
-  xbt_assert(SD_workstation_get_number() > 0, "There is no workstation!");
+  xbt_assert(SD_workstation_get_count() > 0, "There is no workstation!");
 
   if (sd_global->workstation_list == NULL)     /* this is the first time the function is called */
     sd_global->workstation_list = (SD_workstation_t*)xbt_dynar_to_array(sg_hosts_as_dynar());
@@ -97,7 +79,7 @@ const SD_workstation_t *SD_workstation_get_list(void) {
  * \return the number of existing workstations
  * \see SD_workstation_get_list()
  */
-int SD_workstation_get_number(void)
+int SD_workstation_get_count(void)
 {
   return sg_host_count();
 }
@@ -172,26 +154,10 @@ void SD_workstation_dump(SD_workstation_t ws)
   xbt_dict_t props;
   xbt_dict_cursor_t cursor=NULL;
   char *key,*data;
-  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));
-  switch (sg_host_sd(ws)->access_mode){
-  case SD_WORKSTATION_SHARED_ACCESS:
-      XBT_INFO("  - access mode: Space shared");
-      break;
-  case SD_WORKSTATION_SEQUENTIAL_ACCESS:
-      XBT_INFO("  - access mode: Exclusive");
-    task = SD_workstation_get_current_task(ws);
-    if(task)
-      XBT_INFO("    current running task: %s",
-               SD_task_get_name(task));
-    else
-      XBT_INFO("    no task running");
-      break;
-  default: break;
-  }
+  XBT_INFO("  - speed: %.0f", SD_workstation_get_speed(ws));
+  XBT_INFO("  - available speed: %.2f", SD_workstation_get_available_speed(ws));
   props = SD_workstation_get_properties(ws);
   
   if (!xbt_dict_is_empty(props)){
@@ -210,7 +176,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,
@@ -222,7 +188,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_number());
+    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,15 +214,15 @@ 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->getSpeed();
+  return workstation->speed();
 }
 /**
  * \brief Returns the amount of cores of a workstation
@@ -265,17 +231,17 @@ double SD_workstation_get_power(SD_workstation_t workstation)
  * \return the amount of cores of this workstation
  */
 int SD_workstation_get_cores(SD_workstation_t workstation) {
-  return workstation->getCoreAmount();
+  return workstation->core_count();
 }
 
 /**
- * \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,49 +258,39 @@ 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);
 }
 
 /**
- * \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()
+ * \see SD_route_get_bandwidth()
  */
-double SD_route_get_current_latency(SD_workstation_t src,
-                                    SD_workstation_t dst)
+double SD_route_get_latency(SD_workstation_t src, SD_workstation_t dst)
 {
+  xbt_dynar_t route = NULL;
+  double latency = 0;
 
-  const SD_link_t *links;
-  int nb_links;
-  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;
 }
 
 /**
- * \brief Returns the bandwidth of the route between two workstations, i.e. the minimum link bandwidth of all
- * between the workstations.
+ * \brief Returns the bandwidth of the route between two workstations,
+ * i.e. the minimum link bandwidth of all between the workstations.
  *
  * \param src the first workstation
  * \param dst the second workstation
- * \return the bandwidth of the route between the two workstations (in bytes/second)
- * \see SD_route_get_current_latency()
+ * \return the bandwidth of the route between the two workstations
+ * (in bytes/second)
+ * \see SD_route_get_latency()
  */
-double SD_route_get_current_bandwidth(SD_workstation_t src,
-                                      SD_workstation_t dst)
+double SD_route_get_bandwidth(SD_workstation_t src, SD_workstation_t dst)
 {
 
   const SD_link_t *links;
@@ -348,7 +304,7 @@ double SD_route_get_current_bandwidth(SD_workstation_t src,
   min_bandwidth = -1.0;
 
   for (i = 0; i < nb_links; i++) {
-    bandwidth = SD_link_get_current_bandwidth(links[i]);
+    bandwidth = sg_link_bandwidth(links[i]);
     if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
       min_bandwidth = bandwidth;
   }
@@ -376,9 +332,10 @@ 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;
+  double latency = 0;
   int i;
 
   xbt_assert(bytes_amount >= 0, "bytes_amount must be greater than or equal to zero");
@@ -387,14 +344,15 @@ 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]);
+    bandwidth = sg_link_bandwidth(links[i]);
     if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
       min_bandwidth = bandwidth;
   }
@@ -402,58 +360,6 @@ double SD_route_get_communication_time(SD_workstation_t src,
   return latency + (bytes_amount / min_bandwidth);
 }
 
-/**
- * \brief Returns the access mode of this workstation.
- *
- * \param workstation a workstation
- * \return the access mode for the tasks running on this workstation:
- * SD_WORKSTATION_SHARED_ACCESS or SD_WORKSTATION_SEQUENTIAL_ACCESS
- *
- * \see SD_workstation_set_access_mode(), e_SD_workstation_access_mode_t
- */
-e_SD_workstation_access_mode_t
-SD_workstation_get_access_mode(SD_workstation_t workstation)
-{
-  return sg_host_sd(workstation)->access_mode;
-}
-
-/**
- * \brief Sets the access mode for the tasks that will be executed on a workstation
- *
- * By default, a workstation model is shared, i.e. several tasks
- * can be executed at the same time on a workstation. The CPU power of
- * the workstation is shared between the running tasks on the workstation.
- * In sequential mode, only one task can use the workstation, and the other
- * tasks wait in a FIFO.
- *
- * \param workstation a workstation
- * \param access_mode the access mode you want to set to this workstation:
- * SD_WORKSTATION_SHARED_ACCESS or SD_WORKSTATION_SEQUENTIAL_ACCESS
- *
- * \see SD_workstation_get_access_mode(), e_SD_workstation_access_mode_t
- */
-void SD_workstation_set_access_mode(SD_workstation_t workstation,
-                                    e_SD_workstation_access_mode_t
-                                    access_mode)
-{
-  xbt_assert(access_mode != SD_WORKSTATION_SEQUENTIAL_ACCESS ||
-             access_mode != SD_WORKSTATION_SHARED_ACCESS,
-             "Trying to set an invalid access mode");
-
-  if (access_mode == sg_host_sd(workstation)->access_mode) {
-    return;                     // nothing is changed
-  }
-
-  sg_host_sd(workstation)->access_mode = access_mode;
-
-  if (access_mode == SD_WORKSTATION_SHARED_ACCESS) {
-    xbt_fifo_free(sg_host_sd(workstation)->task_fifo);
-    sg_host_sd(workstation)->task_fifo = NULL;
-  } else {
-	  sg_host_sd(workstation)->task_fifo = xbt_fifo_new();
-  }
-}
-
 /**
  * \brief Return the list of mounted storages on a workstation.
  *
@@ -484,68 +390,3 @@ const char *SD_storage_get_host(msg_storage_t storage) {
   SD_storage_priv_t priv = SD_storage_priv(storage);
   return priv->host;
 }
-
-/* Returns whether a task can start now on a workstation*/
-/*
-  int __SD_workstation_can_start(SD_workstation_t workstation, SD_task_t task) {
-  SD_CHECK_INIT_DONE();
-  xbt_assert(workstation != NULL && task != NULL, "Invalid parameter");
-
-  return !__SD_workstation_is_busy(workstation) &&
-  (xbt_fifo_size(workstation->task_fifo) == 0) || xbt_fifo_get_first_item(workstation->task_fifo) == task);
-  }
-*/
-
-/* Returns whether a workstation is busy. A workstation is busy is it is
- * in sequential mode and a task is running on it or the fifo is not empty.
- */
-int __SD_workstation_is_busy(SD_workstation_t workstation)
-{
-  XBT_DEBUG
-      ("Workstation '%s' access mode: '%s', current task: %s, fifo size: %d",
-       SD_workstation_get_name(workstation),
-       (sg_host_sd(workstation)->access_mode ==
-        SD_WORKSTATION_SHARED_ACCESS) ? "SHARED" : "FIFO",
-       (sg_host_sd(workstation)->current_task ?
-        SD_task_get_name(sg_host_sd(workstation)->current_task)
-        : "none"),
-       (sg_host_sd(workstation)->task_fifo ? xbt_fifo_size(sg_host_sd(workstation)->task_fifo) :
-        0));
-
-  return sg_host_sd(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS &&
-      (sg_host_sd(workstation)->current_task != NULL
-       || xbt_fifo_size(sg_host_sd(workstation)->task_fifo) > 0);
-}
-
-/* Destroys a workstation.
- */
-void __SD_workstation_destroy(void *workstation)
-{
-
-  if (workstation==NULL)
-	  return;
-  SD_workstation_priv_t w;
-
-  /* workstation->surf_workstation is freed by surf_exit and workstation->data is freed by the user */
-
-  w = (SD_workstation_priv_t) workstation;
-
-  if (w->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) {
-    xbt_fifo_free(w->task_fifo);
-  }
-  xbt_free(w);
-}
-
-/** 
- * \brief Returns the kind of the task currently running on a workstation
- * Only call this with sequential access mode set
- * \param workstation a workstation */
-SD_task_t SD_workstation_get_current_task(SD_workstation_t workstation)
-{
-  xbt_assert(sg_host_sd(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS,
-              "Access mode must be set to SD_WORKSTATION_SEQUENTIAL_ACCESS"
-              " to use this function");
-
-  return (sg_host_sd(workstation)->current_task);
-}
-