#include "surf_routing_private.hpp"
#include "surf_routing_cluster.hpp"
-#include "simgrid/platf_interface.h" // platform creation API internal interface
#include "simgrid/sg_config.h"
#include "storage_interface.hpp"
-#include "src/surf/platform.hpp"
#include "surf/surfxml_parse_values.h"
#include "src/surf/surf_routing_cluster_torus.hpp"
#include "src/surf/surf_routing_floyd.hpp"
#include "src/surf/surf_routing_full.hpp"
#include "src/surf/surf_routing_vivaldi.hpp"
+#include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
-/*************
- * Callbacks *
- *************/
+#include <vector>
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
namespace simgrid {
namespace surf {
-simgrid::xbt::signal<void(simgrid::surf::NetCard*)> netcardCreatedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
+ /* Callbacks */
+ simgrid::xbt::signal<void(simgrid::surf::NetCard*)> netcardCreatedCallbacks;
+ simgrid::xbt::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
-}
-}
+ As::As(const char*name)
+ : name_(xbt_strdup(name))
+ {}
+ As::~As()
+ {
+ xbt_dict_free(&sons_);
+ xbt_dynar_free(&vertices_);
+ xbt_dynar_free(&upDownLinks);
+ if (nullptr != bypassRoutes_)
+ for (auto &kv : *bypassRoutes_)
+ delete kv.second;
+ delete bypassRoutes_;
+ xbt_free(name_);
+ delete netcard_;
+ }
+ void As::Seal()
+ {
+ sealed_ = true;
+ }
+
+ xbt_dynar_t As::getOneLinkRoutes() {
+ return NULL;
+ }
+
+ int As::addComponent(NetCard *elm) {
+ XBT_DEBUG("Load component \"%s\"", elm->name());
+ xbt_dynar_push_as(vertices_, NetCard*, elm);
+ return xbt_dynar_length(vertices_)-1;
+ }
+
+ void As::addRoute(sg_platf_route_cbarg_t /*route*/){
+ xbt_die("AS %s does not accept new routes (wrong class).",name_);
+ }
+
+ std::vector<Link*> *As::getBypassRoute(NetCard *src, NetCard *dst)
+ {
+ // If never set a bypass route return NULL without any further computations
+ XBT_DEBUG("generic_get_bypassroute from %s to %s", src->name(), dst->name());
+ if (bypassRoutes_ == nullptr)
+ return nullptr;
+
+ std::vector<Link*> *bypassedRoute = nullptr;
+
+ if(dst->containingAS() == this && src->containingAS() == this ){
+ char *route_name = bprintf("%s#%s", src->name(), dst->name());
+ if (bypassRoutes_->find(route_name) != bypassRoutes_->end()) {
+ bypassedRoute = bypassRoutes_->at(route_name);
+ XBT_DEBUG("Found a bypass route with %zu links",bypassedRoute->size());
+ }
+ free(route_name);
+ return bypassedRoute;
+ }
+
+ int index_src, index_dst;
+ As **current_src = NULL;
+ As **current_dst = NULL;
+
+ As *src_as = src->containingAS();
+ As *dst_as = dst->containingAS();
+
+ /* (2) find the path to the root routing component */
+ xbt_dynar_t path_src = xbt_dynar_new(sizeof(As*), NULL);
+ As *current = src_as;
+ while (current != NULL) {
+ xbt_dynar_push(path_src, ¤t);
+ current = current->father_;
+ }
+ xbt_dynar_t path_dst = xbt_dynar_new(sizeof(As*), NULL);
+ current = dst_as;
+ while (current != NULL) {
+ xbt_dynar_push(path_dst, ¤t);
+ current = current->father_;
+ }
+
+ /* (3) find the common father */
+ index_src = path_src->used - 1;
+ index_dst = path_dst->used - 1;
+ current_src = (As **) xbt_dynar_get_ptr(path_src, index_src);
+ current_dst = (As **) xbt_dynar_get_ptr(path_dst, index_dst);
+ while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) {
+ xbt_dynar_pop_ptr(path_src);
+ xbt_dynar_pop_ptr(path_dst);
+ index_src--;
+ index_dst--;
+ current_src = (As **) xbt_dynar_get_ptr(path_src, index_src);
+ current_dst = (As **) xbt_dynar_get_ptr(path_dst, index_dst);
+ }
+
+ int max_index_src = path_src->used - 1;
+ int max_index_dst = path_dst->used - 1;
+
+ int max_index = std::max(max_index_src, max_index_dst);
+
+ for (int max = 0; max <= max_index; max++) {
+ for (int i = 0; i < max; i++) {
+ if (i <= max_index_src && max <= max_index_dst) {
+ char *route_name = bprintf("%s#%s",
+ (*(As **) (xbt_dynar_get_ptr(path_src, i)))->name_,
+ (*(As **) (xbt_dynar_get_ptr(path_dst, max)))->name_);
+ if (bypassRoutes_->find(route_name) != bypassRoutes_->end())
+ bypassedRoute = bypassRoutes_->at(route_name);
+ xbt_free(route_name);
+ }
+ if (bypassedRoute)
+ break;
+ if (max <= max_index_src && i <= max_index_dst) {
+ char *route_name = bprintf("%s#%s",
+ (*(As **) (xbt_dynar_get_ptr(path_src, max)))->name_,
+ (*(As **) (xbt_dynar_get_ptr(path_dst, i)))->name_);
+ if (bypassRoutes_->find(route_name) != bypassRoutes_->end())
+ bypassedRoute = bypassRoutes_->at(route_name);
+ xbt_free(route_name);
+ }
+ if (bypassedRoute)
+ break;
+ }
+
+ if (bypassedRoute)
+ break;
+
+ if (max <= max_index_src && max <= max_index_dst) {
+ char *route_name = bprintf("%s#%s",
+ (*(As **) (xbt_dynar_get_ptr(path_src, max)))->name_,
+ (*(As **) (xbt_dynar_get_ptr(path_dst, max)))->name_);
+
+ if (bypassRoutes_->find(route_name) != bypassRoutes_->end())
+ bypassedRoute = bypassRoutes_->at(route_name);
+ xbt_free(route_name);
+ }
+ if (bypassedRoute)
+ break;
+ }
+
+ xbt_dynar_free(&path_src);
+ xbt_dynar_free(&path_dst);
+
+ return bypassedRoute;
+ }
+
+ void As::addBypassRoute(sg_platf_route_cbarg_t e_route){
+ const char *src = e_route->src;
+ const char *dst = e_route->dst;
+
+ if(bypassRoutes_ == nullptr)
+ bypassRoutes_ = new std::map<std::string, std::vector<Link*>*>();
+
+ char *route_name = bprintf("%s#%s", src, dst);
+
+ /* Argument validity checks */
+ if (e_route->gw_dst) {
+ XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s",
+ src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+ xbt_assert(!xbt_dynar_is_empty(e_route->link_list), "Bypass route between %s@%s and %s@%s cannot be empty.",
+ src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+ xbt_assert(bypassRoutes_->find(route_name) == bypassRoutes_->end(),
+ "The bypass route between %s@%s and %s@%s already exists.",
+ src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+ } else {
+ XBT_DEBUG("Load bypassRoute from %s to %s", src, dst);
+ xbt_assert(!xbt_dynar_is_empty(e_route->link_list), "Bypass route between %s and %s cannot be empty.", src, dst);
+ xbt_assert(bypassRoutes_->find(route_name) == bypassRoutes_->end(), "The bypass route between %s and %s already exists.", src, dst);
+ }
+
+ /* Build the value that will be stored in the dict */
+ std::vector<Link*> *newRoute = new std::vector<Link*>();
+ char *linkName;
+ unsigned int cpt;
+ xbt_dynar_foreach(e_route->link_list, cpt, linkName) {
+ Link *link = Link::byName(linkName);
+ if (link)
+ newRoute->push_back(link);
+ else
+ THROWF(mismatch_error, 0, "Link '%s' not found", linkName);
+ }
+
+ /* Store it */
+ bypassRoutes_->insert({route_name, newRoute});
+ xbt_free(route_name);
+ }
+
+}} // namespace simgrid::surf
/**
* @ingroup SURF_build_api
simgrid::surf::NetCard *sg_netcard_by_name_or_null(const char *name)
{
sg_host_t h = sg_host_by_name(name);
- simgrid::surf::NetCard *net_elm = h==NULL?NULL: h->pimpl_netcard;
- if (!net_elm)
- net_elm = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
- return net_elm;
+ simgrid::surf::NetCard *netcard = h==NULL ? NULL: h->pimpl_netcard;
+ if (!netcard)
+ netcard = (simgrid::surf::NetCard*) xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
+ return netcard;
}
/* Global vars */
simgrid::surf::RoutingPlatf *routing_platf = NULL;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
/** The current AS in the parsing */
static simgrid::surf::As *current_routing = NULL;
return current_routing;
}
-/* this lines are only for replace use like index in the model table */
-typedef enum {
- SURF_MODEL_FULL = 0,
- SURF_MODEL_FLOYD,
- SURF_MODEL_DIJKSTRA,
- SURF_MODEL_DIJKSTRACACHE,
- SURF_MODEL_NONE,
- SURF_MODEL_VIVALDI,
- SURF_MODEL_CLUSTER,
- SURF_MODEL_TORUS_CLUSTER,
- SURF_MODEL_FAT_TREE_CLUSTER,
-} e_routing_types;
-
/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */
void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t netcard_arg)
{
xbt_assert(link_up_down.link_down, "Link '%s' not found!",netcard_arg->link_down);
// If dynar is is greater than netcard id and if the host_link is already defined
- if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > netcard->getId() &&
- xbt_dynar_get_as(current_routing->p_linkUpDownList, netcard->getId(), void*))
+ if((int)xbt_dynar_length(current_routing->upDownLinks) > netcard->id() &&
+ xbt_dynar_get_as(current_routing->upDownLinks, netcard->id(), void*))
surf_parse_error("Host_link for '%s' is already defined!",netcard_arg->id);
- XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->getName(), netcard->getId());
- xbt_dynar_set_as(current_routing->p_linkUpDownList, netcard->getId(), s_surf_parsing_link_up_down_t, link_up_down);
+ XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name(), netcard->id());
+ xbt_dynar_set_as(current_routing->upDownLinks, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down);
}
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
{
XBT_DEBUG("routing_AS_begin");
- xbt_assert(NULL == xbt_lib_get_or_null(as_router_lib, AS->id, ROUTING_ASR_LEVEL),
+ xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, AS->id, ROUTING_ASR_LEVEL),
"Refusing to create a second AS called \"%s\".", AS->id);
_sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent
* any further config now that we created some real content */
- simgrid::surf::As *new_as = NULL;
/* search the routing model */
+ simgrid::surf::As *new_as = NULL;
switch(AS->routing){
- case A_surfxml_AS_routing_Cluster: new_as = new simgrid::surf::AsCluster(); break;
- case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::surf::AsClusterTorus(); break;
- case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::surf::AsClusterFatTree(); break;
- case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::surf::AsDijkstra(0); break;
- case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::surf::AsDijkstra(1); break;
- case A_surfxml_AS_routing_Floyd: new_as = new simgrid::surf::AsFloyd(); break;
- case A_surfxml_AS_routing_Full: new_as = new simgrid::surf::AsFull(); break;
- case A_surfxml_AS_routing_None: new_as = new simgrid::surf::AsNone(); break;
- case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::surf::AsVivaldi(); break;
- default: xbt_die("Not a valid model!"); break;
+ case A_surfxml_AS_routing_Cluster: new_as = new simgrid::surf::AsCluster(AS->id); break;
+ case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::surf::AsClusterTorus(AS->id); break;
+ case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::surf::AsClusterFatTree(AS->id); break;
+ case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::surf::AsDijkstra(AS->id, 0); break;
+ case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::surf::AsDijkstra(AS->id, 1); break;
+ case A_surfxml_AS_routing_Floyd: new_as = new simgrid::surf::AsFloyd(AS->id); break;
+ case A_surfxml_AS_routing_Full: new_as = new simgrid::surf::AsFull(AS->id); break;
+ case A_surfxml_AS_routing_None: new_as = new simgrid::surf::AsNone(AS->id); break;
+ case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::surf::AsVivaldi(AS->id); break;
+ default: xbt_die("Not a valid model!"); break;
}
/* make a new routing component */
+ simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name_, SURF_NETWORK_ELEMENT_AS, current_routing);
- new_as->p_hierarchy = SURF_ROUTING_NULL;
- new_as->p_name = xbt_strdup(AS->id);
-
- simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->p_name, SURF_NETWORK_ELEMENT_AS, current_routing);
- if (current_routing == NULL && routing_platf->p_root == NULL) {
-
+ if (current_routing == NULL && routing_platf->root_ == NULL) {
/* it is the first one */
- new_as->p_routingFather = NULL;
- routing_platf->p_root = new_as;
+ new_as->father_ = NULL;
+ routing_platf->root_ = new_as;
netcard->setId(-1);
- } else if (current_routing != NULL && routing_platf->p_root != NULL) {
+ } else if (current_routing != NULL && routing_platf->root_ != NULL) {
- xbt_assert(!xbt_dict_get_or_null
- (current_routing->p_routingSons, AS->id),
+ xbt_assert(!xbt_dict_get_or_null(current_routing->sons_, AS->id),
"The AS \"%s\" already exists", AS->id);
/* it is a part of the tree */
- new_as->p_routingFather = current_routing;
+ new_as->father_ = current_routing;
/* set the father behavior */
- if (current_routing->p_hierarchy == SURF_ROUTING_NULL)
- current_routing->p_hierarchy = SURF_ROUTING_RECURSIVE;
+ if (current_routing->hierarchy_ == SURF_ROUTING_NULL)
+ current_routing->hierarchy_ = SURF_ROUTING_RECURSIVE;
/* add to the sons dictionary */
- xbt_dict_set(current_routing->p_routingSons, AS->id,
+ xbt_dict_set(current_routing->sons_, AS->id,
(void *) new_as, NULL);
/* add to the father element list */
- netcard->setId(current_routing->parseAS(netcard));
+ netcard->setId(current_routing->addComponent(netcard));
} else {
THROWF(arg_error, 0, "All defined components must belong to a AS");
}
- xbt_lib_set(as_router_lib, netcard->getName(), ROUTING_ASR_LEVEL,
- (void *) netcard);
- XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, netcard->getId());
+ xbt_lib_set(as_router_lib, netcard->name(), ROUTING_ASR_LEVEL, (void *) netcard);
+ XBT_DEBUG("Having set name '%s' id '%d'", new_as->name_, netcard->id());
/* set the new current component of the tree */
current_routing = new_as;
- current_routing->p_netcard = netcard;
+ current_routing->netcard_ = netcard;
simgrid::surf::netcardCreatedCallbacks(netcard);
simgrid::surf::asCreatedCallbacks(new_as);
{
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->Seal();
- current_routing = current_routing->p_routingFather;
+ current_routing = current_routing->father_;
}
/* Aux Business methods */
AS_t * res_dst)
{
xbt_assert(src && dst, "bad parameters for \"elements_father\" method");
-#define ELEMENTS_FATHER_MAXDEPTH 16 /* increase if it is not enough */
- simgrid::surf::As *src_as, *dst_as;
- simgrid::surf::As *path_src[ELEMENTS_FATHER_MAXDEPTH];
- simgrid::surf::As *path_dst[ELEMENTS_FATHER_MAXDEPTH];
+#define ROUTING_HIERARCHY_MAXDEPTH 16 /* increase if it is not enough */
+ simgrid::surf::As *path_src[ROUTING_HIERARCHY_MAXDEPTH];
+ simgrid::surf::As *path_dst[ROUTING_HIERARCHY_MAXDEPTH];
int index_src = 0;
int index_dst = 0;
- simgrid::surf::As *current;
simgrid::surf::As *current_src;
simgrid::surf::As *current_dst;
simgrid::surf::As *father;
- /* (1) find the as where the src and dst are located */
- sg_netcard_t src_data = src;
- sg_netcard_t dst_data = dst;
- src_as = src_data->getRcComponent();
- dst_as = dst_data->getRcComponent();
-#ifndef NDEBUG
- char* src_name = src_data->getName();
- char* dst_name = dst_data->getName();
-#endif
+ /* (1) find the path to root of src and dst*/
+ simgrid::surf::As *src_as = src->containingAS();
+ simgrid::surf::As *dst_as = dst->containingAS();
- xbt_assert(src_as && dst_as,
- "Ask for route \"from\"(%s) or \"to\"(%s) no found", src_name, dst_name);
+ xbt_assert(src_as, "Host %s must be in an AS", src->name());
+ xbt_assert(dst_as, "Host %s must be in an AS", dst->name());
/* (2) find the path to the root routing component */
- for (current = src_as; current != NULL; current = current->p_routingFather) {
- if (index_src >= ELEMENTS_FATHER_MAXDEPTH)
- xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_src");
+ for (simgrid::surf::As *current = src_as; current != NULL; current = current->father_) {
+ if (index_src >= ROUTING_HIERARCHY_MAXDEPTH)
+ xbt_die("ROUTING_HIERARCHY_MAXDEPTH should be increased for element %s", src->name());
path_src[index_src++] = current;
}
- for (current = dst_as; current != NULL; current = current->p_routingFather) {
- if (index_dst >= ELEMENTS_FATHER_MAXDEPTH)
- xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_dst");
+ for (simgrid::surf::As *current = dst_as; current != NULL; current = current->father_) {
+ if (index_dst >= ROUTING_HIERARCHY_MAXDEPTH)
+ xbt_die("ROUTING_HIERARCHY_MAXDEPTH should be increased for path_dst");
path_dst[index_dst++] = current;
}
*res_src = current_src; /* second the first different father of src */
*res_dst = current_dst; /* three the first different father of dst */
-#undef ELEMENTS_FATHER_MAXDEPTH
+#undef ROUTING_HIERARCHY_MAXDEPTH
}
-/* Global Business methods */
-
/**
- * \brief Recursive function for get_route_latency
+ * \brief Recursive function for get_route_and_latency
*
* \param src the source host name
* \param dst the destination host name
* \param *route the route where the links are stored. It is either NULL or a ready to use dynar
* \param *latency the latency, if needed
- *
- * This function is called by "get_route" and "get_latency". It allows to walk
- * recursively through the ASes tree.
*/
-static void _get_route_and_latency(
- simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst,
+static void _get_route_and_latency(simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst,
xbt_dynar_t * links, double *latency)
{
s_sg_platf_route_cbarg_t route = SG_PLATF_ROUTE_INITIALIZER;
memset(&route,0,sizeof(route));
xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");
- XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->getName(), dst->getName());
+ XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name(), dst->name());
/* Find how src and dst are interconnected */
simgrid::surf::As *common_father, *src_father, *dst_father;
elements_father(src, dst, &common_father, &src_father, &dst_father);
XBT_DEBUG("elements_father: common father '%s' src_father '%s' dst_father '%s'",
- common_father->p_name, src_father->p_name, dst_father->p_name);
-
- /* Check whether a direct bypass is defined */
- sg_platf_route_cbarg_t e_route_bypass = NULL;
- //FIXME:REMOVE:if (common_father->get_bypass_route)
-
- e_route_bypass = common_father->getBypassRoute(src, dst, latency);
-
- /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */
- if (e_route_bypass) {
- xbt_dynar_merge(links, &e_route_bypass->link_list);
- routing_route_free(e_route_bypass);
+ common_father->name_, src_father->name_, dst_father->name_);
+
+ /* Check whether a direct bypass is defined. If so, use it and bail out */
+ std::vector<Link*> *bypassed_route = common_father->getBypassRoute(src, dst);
+ if (nullptr != bypassed_route) {
+ for (Link *link : *bypassed_route) {
+ xbt_dynar_push(*links,&link);
+ if (latency)
+ *latency += link->getLatency();
+ }
return;
}
if (src_father == dst_father) { /* SURF_ROUTING_BASE */
route.link_list = *links;
common_father->getRouteAndLatency(src, dst, &route, latency);
- // if vivaldi latency+=vivaldi(src,dst)
return;
}
/* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/
- route.link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
- // Find the net_card corresponding to father
- simgrid::surf::NetCard *src_father_netcard = src_father->p_netcard;
- simgrid::surf::NetCard *dst_father_netcard = dst_father->p_netcard;
-
- common_father->getRouteAndLatency(src_father_netcard, dst_father_netcard,
- &route, latency);
+ route.link_list = xbt_dynar_new(sizeof(Link*), NULL);
+ common_father->getRouteAndLatency(src_father->netcard_, dst_father->netcard_, &route, latency);
xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL),
- "bad gateways for route from \"%s\" to \"%s\"", src->getName(), dst->getName());
-
- sg_netcard_t src_gateway_net_elm = route.gw_src;
- sg_netcard_t dst_gateway_net_elm = route.gw_dst;
+ "bad gateways for route from \"%s\" to \"%s\"", src->name(), dst->name());
/* If source gateway is not our source, we have to recursively find our way up to this point */
- if (src != src_gateway_net_elm)
- _get_route_and_latency(src, src_gateway_net_elm, links, latency);
+ if (src != route.gw_src)
+ _get_route_and_latency(src, route.gw_src, links, latency);
xbt_dynar_merge(links, &route.link_list);
/* If dest gateway is not our destination, we have to recursively find our way from this point */
- if (dst_gateway_net_elm != dst)
- _get_route_and_latency(dst_gateway_net_elm, dst, links, latency);
-
-}
-
-AS_t surf_platf_get_root(routing_platf_t platf){
- return platf->p_root;
-}
+ if (route.gw_dst != dst)
+ _get_route_and_latency(route.gw_dst, dst, links, latency);
-e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_netcard_t netcard){
- return netcard->getRcType();
}
namespace simgrid {
*/
void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t* route, double *latency)
{
- XBT_DEBUG("getRouteAndLatency from %s to %s", src->getName(), dst->getName());
+ XBT_DEBUG("getRouteAndLatency from %s to %s", src->name(), dst->name());
if (NULL == *route) {
- xbt_dynar_reset(routing_platf->p_lastRoute);
- *route = routing_platf->p_lastRoute;
+ xbt_dynar_reset(routing_platf->lastRoute_);
+ *route = routing_platf->lastRoute_;
}
_get_route_and_latency(src, dst, route, latency);
-
- xbt_assert(!latency || *latency >= 0.0,
- "negative latency on route between \"%s\" and \"%s\"", src->getName(), dst->getName());
}
-xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
- return recursiveGetOneLinkRoutes(p_root);
-}
-
-xbt_dynar_t RoutingPlatf::recursiveGetOneLinkRoutes(As *rc)
+static xbt_dynar_t _recursiveGetOneLinkRoutes(As *rc)
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
char *key;
xbt_dict_cursor_t cursor = NULL;
AS_t rc_child;
- xbt_dict_foreach(rc->p_routingSons, cursor, key, rc_child) {
- xbt_dynar_t onelink_child = recursiveGetOneLinkRoutes(rc_child);
+ xbt_dict_foreach(rc->sons_, 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_);
}
-}
-
-e_surf_network_element_type_t routing_get_network_element_type(const char *name)
-{
- simgrid::surf::NetCard *rc = sg_netcard_by_name_or_null(name);
- if (rc)
- return rc->getRcType();
- return SURF_NETWORK_ELEMENT_NULL;
+}
}
/** @brief create the root AS */
/* ************************************************************************** */
/* ************************* GENERIC PARSE FUNCTIONS ************************ */
-void routing_cluster_add_backbone(void* bb) {
+void routing_cluster_add_backbone(simgrid::surf::Link* bb) {
simgrid::surf::AsCluster *cluster = dynamic_cast<simgrid::surf::AsCluster*>(current_routing);
xbt_assert(cluster, "Only hosts from Cluster can get a backbone.");
- xbt_assert(nullptr == cluster->p_backbone, "Cluster %s already has a backbone link!", cluster->p_name);
+ xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->name_);
- cluster->p_backbone = static_cast<simgrid::surf::Link*>(bb);
- XBT_DEBUG("Add a backbone to AS '%s'", current_routing->p_name);
+ cluster->backbone_ = bb;
+ XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name_);
}
void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
router.id = router_id;
router.coord = peer->coord;
sg_platf_new_router(&router);
- static_cast<AsCluster*>(current_routing)->p_router = static_cast<NetCard*>(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL));
+ static_cast<AsCluster*>(current_routing)->router_ = static_cast<NetCard*>(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL));
XBT_DEBUG("</AS>");
sg_platf_new_AS_end();
char *key;
AS_t elem;
- xbt_dict_foreach(as->p_routingSons, cursor, key, elem) {
+ xbt_dict_foreach(as->sons_, cursor, key, elem) {
finalize_rec(elem);
}
namespace surf {
RoutingPlatf::RoutingPlatf(void *loopback)
- : p_loopback(loopback)
+ : loopback_(loopback)
{
}
RoutingPlatf::~RoutingPlatf()
{
- xbt_dynar_free(&p_lastRoute);
- finalize_rec(p_root);
+ xbt_dynar_free(&lastRoute_);
+ finalize_rec(root_);
}
}
}
AS_t surf_AS_get_routing_root() {
- return routing_platf->p_root;
+ return routing_platf->root_;
}
const char *surf_AS_get_name(simgrid::surf::As *as) {
- return as->p_name;
+ return as->name_;
}
static simgrid::surf::As *surf_AS_recursive_get_by_name(
AS_t elem;
simgrid::surf::As *tmp = NULL;
- if(!strcmp(current->p_name, name))
+ if(!strcmp(current->name_, name))
return current;
- xbt_dict_foreach(current->p_routingSons, cursor, key, elem) {
+ xbt_dict_foreach(current->sons_, cursor, key, elem) {
tmp = surf_AS_recursive_get_by_name(elem, name);
if(tmp != NULL ) {
break;
simgrid::surf::As *surf_AS_get_by_name(const char * name)
{
- simgrid::surf::As *as = surf_AS_recursive_get_by_name(routing_platf->p_root, name);
+ simgrid::surf::As *as = surf_AS_recursive_get_by_name(routing_platf->root_, name);
if(as == NULL)
XBT_WARN("Impossible to find an AS with name %s, please check your input", name);
return as;
xbt_dict_t surf_AS_get_routing_sons(simgrid::surf::As *as)
{
- return as->p_routingSons;
+ return as->sons_;
}
xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as)
{
- xbt_dynar_t elms = as->p_indexNetworkElm;
+ xbt_dynar_t elms = as->vertices_;
int count = xbt_dynar_length(elms);
xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), NULL);
for (int index = 0; index < count; index++) {
sg_netcard_t relm =
xbt_dynar_get_as(elms, index, simgrid::surf::NetCard*);
- sg_host_t delm = simgrid::s4u::Host::by_name_or_null(relm->getName());
+ sg_host_t delm = simgrid::s4u::Host::by_name_or_null(relm->name());
if (delm!=NULL) {
xbt_dynar_push(res, &delm);
}
