X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b0f98ac988ab02b9c1bb09738a0342d31b2554ad..5e6a418ff33f9fcc57a1a6bebb3af4598a4b2eff:/src/simdag/sd_workstation.cpp

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index 8caaff51c9..1c54dcd7c9 100644
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -14,32 +14,6 @@
 #include "xbt/sysdep.h"
 #include "surf/surf.h"
 
-/* Creates a storage and registers it in SD.
- */
-SD_storage_t __SD_storage_create(void *surf_storage, void *data)
-{
-
-  SD_storage_priv_t storage;
-  const char *name;
-
-  storage = xbt_new(s_SD_storage_priv_t, 1);
-  storage->data = data;     /* user data */
-  name = surf_resource_name((surf_cpp_resource_t)surf_storage);
-  storage->host = (const char*)surf_storage_get_host( (surf_resource_t )surf_storage_resource_by_name(name));
-  xbt_lib_set(storage_lib,name, SD_STORAGE_LEVEL, storage);
-  return xbt_lib_get_elm_or_null(storage_lib, name);
-}
-
-/* Destroys a storage.
- */
-void __SD_storage_destroy(void *storage)
-{
-  SD_storage_priv_t s;
-
-  s = (SD_storage_priv_t) storage;
-  xbt_free(s);
-}
-
 /** @brief Returns the route between two workstations
  *
  * Use SD_route_get_size() to know the array size.
@@ -49,16 +23,13 @@ void __SD_storage_destroy(void *storage)
  * \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);
+  xbt_dynar_t surf_route = surf_host_model_get_route((surf_host_model_t)surf_host_model, src, dst);
 
-  list = xbt_new(SD_link_t, xbt_dynar_length(surf_route));
+  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;
   }
@@ -75,8 +46,7 @@ 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));
+  return xbt_dynar_length(surf_host_model_get_route((surf_host_model_t)surf_host_model, src, dst));
 }
 
 /**
@@ -92,8 +62,7 @@ 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);
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, &latency);
 
   return latency;
 }
@@ -104,8 +73,7 @@ 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)
@@ -113,55 +81,16 @@ 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);
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, &route, &latency);
 
   xbt_dynar_foreach(route, cpt, link){
-    bandwidth = sg_link_bandwidth(link);
+    double bandwidth = sg_link_bandwidth(link);
     if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
       min_bandwidth = bandwidth;
   }
 
   return min_bandwidth;
 }
-
-/**
- * \brief Returns an approximative estimated time for the given
- * communication amount between two hosts
- *
- * \param src the first host
- * \param dst the second host
- * \param bytes_amount the communication amount you want to evaluate (in bytes)
- * \return an approximative estimated communication time for the given bytes amount
- * between the workstations (in seconds)
- */
-double SD_route_get_communication_time(sg_host_t src,sg_host_t dst,
-                                       double bytes_amount)
-{
-  /* total time = latency + transmission time of the slowest link
-     transmission time of a link = communication amount / link bandwidth */
-
-  xbt_assert(bytes_amount >= 0, "bytes_amount must be greater than or equal to zero");
-
-
-  if (bytes_amount == 0.0)
-    return 0.0;
-
-  return SD_route_get_latency(src, dst) +
-          (bytes_amount / SD_route_get_bandwidth(src,dst));
-}
-
-/**
- * \brief Returns the host name the storage is attached to
- *
- * This functions checks whether a storage is a valid pointer or not and return its name.
- */
-const char *SD_storage_get_host(msg_storage_t storage) {
-  xbt_assert((storage != NULL), "Invalid parameters");
-  SD_storage_priv_t priv = SD_storage_priv(storage);
-  return priv->host;
-}