X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/198b09ec16ca1b8fc05053bcae9e75c0ad689711..f602ee5e834cf7bf6d1e1be849daae79a54e7274:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 7875245f8a..d4cd3d5273 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -4,35 +4,36 @@ /* 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 + +#include + +#include + #include "surf_routing.hpp" #include "simgrid/sg_config.h" #include "storage_interface.hpp" -#include "src/surf/AsImpl.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area -#include - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); namespace simgrid { +namespace kernel { namespace routing { /* Callbacks */ - simgrid::xbt::signal netcardCreatedCallbacks; - simgrid::xbt::signal asCreatedCallbacks; + simgrid::xbt::signal netcardCreatedCallbacks; + simgrid::xbt::signal asCreatedCallbacks; - -}} // namespace simgrid::routing +}}} // namespace simgrid::kernel::routing /** * @ingroup SURF_build_api * @brief A library containing all known hosts */ -xbt_dict_t host_list = nullptr; - -int COORD_HOST_LEVEL = -1; //Coordinates level int MSG_FILE_LEVEL = -1; //Msg file level @@ -49,18 +50,17 @@ int ROUTING_PROP_ASR_LEVEL = -1; //Where the properties are stored * * Netcards are the thing that connect host or routers to the network */ -simgrid::routing::NetCard *sg_netcard_by_name_or_null(const char *name) +simgrid::kernel::routing::NetCard *sg_netcard_by_name_or_null(const char *name) { sg_host_t h = sg_host_by_name(name); - simgrid::routing::NetCard *netcard = h==nullptr ? nullptr: h->pimpl_netcard; + simgrid::kernel::routing::NetCard *netcard = h==nullptr ? nullptr: h->pimpl_netcard; if (!netcard) - netcard = (simgrid::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); + netcard = (simgrid::kernel::routing::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); return netcard; } /* Global vars */ -simgrid::routing::RoutingPlatf *routing_platf = nullptr; - +simgrid::kernel::routing::RoutingPlatf* routing_platf = new simgrid::kernel::routing::RoutingPlatf(); void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) { @@ -76,6 +76,7 @@ void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) } namespace simgrid { +namespace kernel { namespace routing { /** @@ -86,7 +87,7 @@ namespace routing { * \param route where to store the list of links. * If *route=nullptr, create a short lived dynar. Else, fill the provided dynar * \param latency where to store the latency experienced on the path (or nullptr if not interested) - * It is the caller responsability to initialize latency to 0 (we add to provided route) + * It is the caller responsibility to initialize latency to 0 (we add to provided route) * \pre route!=nullptr * * walk through the routing components tree and find a route between hosts @@ -94,44 +95,19 @@ namespace routing { */ void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, std::vector * route, double *latency) { - XBT_DEBUG("getRouteAndLatency from %s to %s", src->name(), dst->name()); + XBT_DEBUG("getRouteAndLatency from %s to %s", src->name().c_str(), dst->name().c_str()); AsImpl::getRouteRecursive(src, dst, route, latency); } -static xbt_dynar_t _recursiveGetOneLinkRoutes(AsImpl *as) +std::vector* RoutingPlatf::getOneLinkRoutes() { - xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f); - - //adding my one link routes - xbt_dynar_t onelink_mine = as->getOneLinkRoutes(); - if (onelink_mine) - xbt_dynar_merge(&ret,&onelink_mine); - - //recursing - char *key; - xbt_dict_cursor_t cursor = nullptr; - AsImpl *rc_child; - xbt_dict_foreach(as->children(), cursor, key, rc_child) { - xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child); - if (onelink_child) - xbt_dynar_merge(&ret,&onelink_child); - } - return ret; -} - -xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){ - return _recursiveGetOneLinkRoutes(root_); + std::vector* res = new std::vector(); + root_->getOneLinkRoutes(res); + return res; } -} -} - -/** @brief create the root AS */ -void routing_model_create(Link *loopback) -{ - routing_platf = new simgrid::routing::RoutingPlatf(loopback); -} +}}} /* ************************************************************************** */ /* ************************* GENERIC PARSE FUNCTIONS ************************ */ @@ -141,13 +117,13 @@ static void check_disk_attachment() xbt_lib_cursor_t cursor; char *key; void **data; - simgrid::routing::NetCard *host_elm; xbt_lib_foreach(storage_lib, cursor, key, data) { - if(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { - simgrid::surf::Storage *storage = static_cast(xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL)); - host_elm = sg_netcard_by_name_or_null(storage->p_attach); - if(!host_elm) - surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->p_attach); + if (xbt_lib_get_level(xbt_lib_get_elm_or_null(storage_lib, key), SURF_STORAGE_LEVEL) != nullptr) { + simgrid::surf::Storage* storage = + static_cast(xbt_lib_get_or_null(storage_lib, key, SURF_STORAGE_LEVEL)); + simgrid::kernel::routing::NetCard* host_elm = sg_netcard_by_name_or_null(storage->attach_); + if (!host_elm) + surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->attach_); } } } @@ -160,15 +136,12 @@ void routing_register_callbacks() } /** \brief Frees all memory allocated by the routing module */ -void routing_exit(void) { +void routing_exit() { delete routing_platf; } -simgrid::routing::RoutingPlatf::RoutingPlatf(simgrid::surf::Link *loopback) -: loopback_(loopback) -{ -} -simgrid::routing::RoutingPlatf::~RoutingPlatf() +simgrid::kernel::routing::RoutingPlatf::RoutingPlatf() = default; +simgrid::kernel::routing::RoutingPlatf::~RoutingPlatf() { delete root_; }