X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/424d509a49e75c18f5b4de3b9065f6623b39a0c5..7441fa1d1bbb15703c9d65f07ed250edafbaff78:/src/simdag/sd_workstation.cpp

diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp
index 83343296ba..ceeb8c1334 100644
--- a/src/simdag/sd_workstation.cpp
+++ b/src/simdag/sd_workstation.cpp
@@ -4,42 +4,11 @@
 /* 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/surf/host_interface.hpp"
 #include "src/simdag/simdag_private.h"
-#include "simgrid/simdag.h"
-#include "simgrid/host.h"
-#include <simgrid/s4u/host.hpp>
-#include "xbt/dict.h"
-#include "xbt/lib.h"
-#include "xbt/sysdep.h"
+#include "simgrid/s4u/host.hpp"
+#include "src/surf/HostImpl.hpp"
 #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,19 +18,17 @@ 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);
+  std::vector<Link*> *route = new std::vector<Link*>();
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
 
-  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;
+
+  delete route;
   return list;
 }
 
@@ -75,8 +42,11 @@ 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));
+  std::vector<Link*> *route = new std::vector<Link*>();
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
+  int size = route->size();
+  delete route;
+  return size;
 }
 
 /**
@@ -89,11 +59,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<Link*> *route = new std::vector<Link*>();
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, &latency);
+  delete route;
 
   return latency;
 }
@@ -104,39 +73,22 @@ 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)
 {
-  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);
+  std::vector<Link*> *route = new std::vector<Link*>();
+  routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
 
-  xbt_dynar_foreach(route, cpt, link){
-    bandwidth = sg_link_bandwidth(link);
+  for (auto link : *route) {
+    double bandwidth = sg_link_bandwidth(link);
     if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
       min_bandwidth = bandwidth;
   }
+  delete route;
 
   return min_bandwidth;
 }
-
-
-/**
- * \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;
-}