X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9735863c1ccb1ae8b55853262d6e1c3ee3a8698f..9a02e3654bd28c13ac053247383566f54fa4498a:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index d9847e293e..d4b0924bcb 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -1,89 +1,86 @@ -/* Copyright (c) 2009-2011, 2013-2015. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2016. The SimGrid Team. * All rights reserved. */ /* 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 "surf_routing_cluster.hpp" #include "simgrid/sg_config.h" #include "storage_interface.hpp" -#include "src/surf/AsImpl.hpp" -#include "src/surf/surf_routing_cluster_torus.hpp" -#include "src/surf/surf_routing_cluster_fat_tree.hpp" -#include "src/surf/surf_routing_dijkstra.hpp" -#include "src/surf/surf_routing_floyd.hpp" -#include "src/surf/surf_routing_full.hpp" -#include "src/surf/surf_routing_vivaldi.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 surf { +namespace kernel { +namespace routing { /* Callbacks */ - simgrid::xbt::signal netcardCreatedCallbacks; - simgrid::xbt::signal asCreatedCallbacks; + simgrid::xbt::signal netcardCreatedCallbacks; + simgrid::xbt::signal asCreatedCallbacks; - -}} // namespace simgrid::surf +}}} // 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=0; //Coordinates level +int COORD_HOST_LEVEL = -1; //Coordinates level -int MSG_FILE_LEVEL; //Msg file level +int MSG_FILE_LEVEL = -1; //Msg file level -int SIMIX_STORAGE_LEVEL; //Simix storage level -int MSG_STORAGE_LEVEL; //Msg storage level +int SIMIX_STORAGE_LEVEL = -1; //Simix storage level +int MSG_STORAGE_LEVEL = -1; //Msg storage level xbt_lib_t as_router_lib; -int ROUTING_ASR_LEVEL; //Routing level -int COORD_ASR_LEVEL; //Coordinates level -int NS3_ASR_LEVEL; //host node for ns3 -int ROUTING_PROP_ASR_LEVEL; //Where the properties are stored +int ROUTING_ASR_LEVEL = -1; //Routing level +int COORD_ASR_LEVEL = -1; //Coordinates level +int NS3_ASR_LEVEL = -1; //host node for ns3 +int ROUTING_PROP_ASR_LEVEL = -1; //Where the properties are stored /** @brief Retrieve a netcard from its name * * Netcards are the thing that connect host or routers to the network */ -simgrid::surf::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::surf::NetCard *netcard = h==NULL ? NULL: h->pimpl_netcard; + simgrid::kernel::routing::NetCard *netcard = h==nullptr ? nullptr: h->pimpl_netcard; if (!netcard) - netcard = (simgrid::surf::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::surf::RoutingPlatf *routing_platf = NULL; +simgrid::kernel::routing::RoutingPlatf *routing_platf = nullptr; void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) { tmgr_trace_t tmgr_trace; - if (!trace->file || strcmp(trace->file, "") != 0) { + if (trace->file && strcmp(trace->file, "") != 0) { tmgr_trace = tmgr_trace_new_from_file(trace->file); } else { xbt_assert(strcmp(trace->pc_data, ""), "Trace '%s' must have either a content, or point to a file on disk.",trace->id); tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity); } - xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL); + xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, nullptr); } namespace simgrid { -namespace surf { +namespace kernel { +namespace routing { /** * \brief Find a route between hosts @@ -91,22 +88,22 @@ namespace surf { * \param src the network_element_t for src host * \param dst the network_element_t for dst host * \param route where to store the list of links. - * If *route=NULL, create a short lived dynar. Else, fill the provided dynar - * \param latency where to store the latency experienced on the path (or NULL if not interested) - * It is the caller responsability to initialize latency to 0 (we add to provided route) - * \pre route!=NULL + * 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 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 * by calling each "get_route" function in each routing component. */ 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(surf::AsImpl *as) +static xbt_dynar_t _recursiveGetOneLinkRoutes(AsImpl *as) { xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f); @@ -117,7 +114,7 @@ static xbt_dynar_t _recursiveGetOneLinkRoutes(surf::AsImpl *as) //recursing char *key; - xbt_dict_cursor_t cursor = NULL; + 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); @@ -131,99 +128,29 @@ xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){ return _recursiveGetOneLinkRoutes(root_); } -} -} +}}} /** @brief create the root AS */ void routing_model_create(Link *loopback) { - routing_platf = new simgrid::surf::RoutingPlatf(loopback); + routing_platf = new simgrid::kernel::routing::RoutingPlatf(loopback); } /* ************************************************************************** */ /* ************************* GENERIC PARSE FUNCTIONS ************************ */ -void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) -{ - int start, end, i; - char *groups , *host_id , *link_id = NULL; - unsigned int iter; - xbt_dynar_t radical_elements; - xbt_dynar_t radical_ends; - - //Make all hosts - radical_elements = xbt_str_split(cabinet->radical, ","); - xbt_dynar_foreach(radical_elements, iter, groups) { - - radical_ends = xbt_str_split(groups, "-"); - start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); - - switch (xbt_dynar_length(radical_ends)) { - case 1: - end = start; - break; - case 2: - end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); - break; - default: - surf_parse_error("Malformed radical"); - break; - } - s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER; - memset(&host, 0, sizeof(host)); - host.pstate = 0; - host.core_amount = 1; - - s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER; - memset(&link, 0, sizeof(link)); - link.policy = SURF_LINK_FULLDUPLEX; - link.latency = cabinet->lat; - link.bandwidth = cabinet->bw; - - s_sg_platf_host_link_cbarg_t host_link = SG_PLATF_HOST_LINK_INITIALIZER; - memset(&host_link, 0, sizeof(host_link)); - - for (i = start; i <= end; i++) { - host_id = bprintf("%s%d%s",cabinet->prefix,i,cabinet->suffix); - link_id = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix); - host.id = host_id; - link.id = link_id; - host.speed_peak = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push(host.speed_peak,&cabinet->speed); - sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_peak); - sg_platf_new_link(&link); - - char* link_up = bprintf("%s_UP",link_id); - char* link_down = bprintf("%s_DOWN",link_id); - host_link.id = host_id; - host_link.link_up = link_up; - host_link.link_down = link_down; - sg_platf_new_hostlink(&host_link); - - free(host_id); - free(link_id); - free(link_up); - free(link_down); - } - - xbt_dynar_free(&radical_ends); - } - xbt_dynar_free(&radical_elements); -} - static void check_disk_attachment() { xbt_lib_cursor_t cursor; char *key; void **data; - simgrid::surf::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) != NULL) { - 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_); } } } @@ -236,15 +163,15 @@ void routing_register_callbacks() } /** \brief Frees all memory allocated by the routing module */ -void routing_exit(void) { +void routing_exit() { delete routing_platf; } -simgrid::surf::RoutingPlatf::RoutingPlatf(simgrid::surf::Link *loopback) +simgrid::kernel::routing::RoutingPlatf::RoutingPlatf(simgrid::surf::Link *loopback) : loopback_(loopback) { } -simgrid::surf::RoutingPlatf::~RoutingPlatf() +simgrid::kernel::routing::RoutingPlatf::~RoutingPlatf() { delete root_; }