X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aabd69e2ec25a7e7e1b6e3d7d86f531c42f4fca9..a9361ff5f9057e93ed0bbdfac0eab6e5ba8aeab8:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 69ab7ead30..e12af64f42 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -1,30 +1,34 @@ -/* 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 "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 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 @@ -32,51 +36,52 @@ namespace surf { */ 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 @@ -84,10 +89,10 @@ 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. @@ -99,7 +104,7 @@ void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, std::vector
  • children(), cursor, key, rc_child) { xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child); @@ -124,13 +129,12 @@ 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); } /* ************************************************************************** */ @@ -141,13 +145,13 @@ static void check_disk_attachment() xbt_lib_cursor_t cursor; char *key; void **data; - simgrid::surf::NetCard *host_elm; + simgrid::kernel::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) != NULL) { + 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); + 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->p_attach); + surf_parse_error("Unable to attach storage %s: host %s doesn't exist.", storage->getName(), storage->attach_); } } } @@ -160,15 +164,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_; }