/* 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 "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);
-}
+#include "simgrid/s4u/host.hpp"
-/* Destroys a storage.
- */
-void __SD_storage_destroy(void *storage)
-{
- SD_storage_priv_t s;
-
- s = (SD_storage_priv_t) storage;
- xbt_free(s);
-}
+#include "simdag_private.hpp"
+#include "src/surf/HostImpl.hpp"
+#include "surf/surf.h"
-/**
- * \brief Returns the route between two workstations
+/** @brief Returns the route between two workstations
*
* Use SD_route_get_size() to know the array size.
*
- * \param src a workstation
- * \param dst another workstation
- * \return a new array of \ref SD_link_t representing the route between these two workstations
+ * \param src a host
+ * \param dst another host
+ * \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;
- void *surf_link;
- unsigned int cpt;
-
- if (sd_global->recyclable_route == NULL) {
- /* first run */
- sd_global->recyclable_route = xbt_new(SD_link_t, sg_link_count());
+ std::vector<Link*> *route = new std::vector<Link*>();
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
+
+ int cpt=0;
+ SD_link_t *list = xbt_new(SD_link_t, route->size());
+ for (auto link : *route){
+ list[cpt] = link;
+ cpt++;
}
-
- surf_route = surf_host_model_get_route((surf_host_model_t)surf_host_model, src, dst);
-
- xbt_dynar_foreach(surf_route, cpt, surf_link) {
- sd_global->recyclable_route[cpt] = (SD_link_t)surf_link;
- }
- return sd_global->recyclable_route;
+ delete route;
+ return list;
}
/**
*/
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;
}
-/**
- * \brief Returns an approximative estimated time for the given computation amount on a workstation
- *
- * \param workstation a workstation
- * \param flops_amount the computation amount you want to evaluate (in flops)
- * \return an approximative estimated computation time for the given computation amount on this workstation (in seconds)
- */
/**
* \brief Returns the latency of the route between two workstations.
*
*/
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;
}
*
* \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)
{
+ double min_bandwidth = -1.0;
- const SD_link_t *links;
- int nb_links;
- double bandwidth;
- double min_bandwidth;
- int i;
+ std::vector<Link*> *route = new std::vector<Link*>();
+ routing_platf->getRouteAndLatency(src->pimpl_netcard, dst->pimpl_netcard, route, nullptr);
- links = SD_route_get_list(src, dst);
- nb_links = SD_route_get_size(src, dst);
- min_bandwidth = -1.0;
-
- for (i = 0; i < nb_links; i++) {
- bandwidth = sg_link_bandwidth(links[i]);
- if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
+ for (auto link : *route) {
+ double bandwidth = sg_link_bandwidth(link);
+ if (bandwidth < min_bandwidth || min_bandwidth < 0.0)
min_bandwidth = bandwidth;
}
+ delete route;
return min_bandwidth;
}
-
-/**
- * \brief Returns an approximative estimated time for the given
- * communication amount between two workstations
- *
- * \param src the first workstation
- * \param dst the second workstation
- * \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 */
-
- const SD_link_t *links;
- xbt_dynar_t route = NULL;
- int nb_links;
- double bandwidth, min_bandwidth;
- double latency = 0;
- int i;
-
- xbt_assert(bytes_amount >= 0, "bytes_amount must be greater than or equal to zero");
-
-
- 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;
-
- for (i = 0; i < nb_links; i++) {
- bandwidth = sg_link_bandwidth(links[i]);
- if (bandwidth < min_bandwidth || min_bandwidth == -1.0)
- min_bandwidth = bandwidth;
- }
-
- return latency + (bytes_amount / min_bandwidth);
-}
-
-/**
- * \brief Return the list of mounted storages on a workstation.
- *
- * \param workstation a workstation
- * \return a dynar containing all mounted storages on the workstation
- */
-/**
- * \brief Return the list of mounted storages on a workstation.
- *
- * \param workstation a workstation
- * \return a dynar containing all mounted storages on the workstation
- */
-/**
- * \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;
-}