X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6534c58a2afafe609a4671073f6b20f839e20fd7..a58e259d1637e654feb295098ad879cd7bab8bf2:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 759ba1266f..7871a416ea 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -21,6 +21,7 @@ #include "src/surf/surf_routing_full.hpp" #include "src/surf/surf_routing_vivaldi.hpp" +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); namespace simgrid { namespace surf { @@ -30,16 +31,34 @@ namespace surf { simgrid::xbt::signal asCreatedCallbacks; As::As(const char*name) - : p_name(xbt_strdup(name)) + : name_(xbt_strdup(name)) {} As::~As() { - xbt_dict_free(&p_routingSons); - xbt_dynar_free(&p_indexNetworkElm); - xbt_dynar_free(&p_linkUpDownList); - xbt_free(p_name); - if (p_netcard) - delete p_netcard; + xbt_dict_free(&sons_); + xbt_dynar_free(&vertices_); + xbt_dynar_free(&upDownLinks); + xbt_free(name_); + if (netcard_) + delete netcard_; + } + + sg_platf_route_cbarg_t As::getBypassRoute(NetCard * /*src*/, NetCard * /*dst*/, double * /*lat*/) { + 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::parseRoute(sg_platf_route_cbarg_t /*route*/){ + THROW_IMPOSSIBLE; /* No. */ + } + void As::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){ + THROW_IMPOSSIBLE; } }} // namespace simgrid::surf @@ -79,7 +98,6 @@ simgrid::surf::NetCard *sg_netcard_by_name_or_null(const char *name) /* 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; @@ -105,12 +123,12 @@ 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) @@ -166,38 +184,38 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) } /* make a new routing component */ - simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->p_name, SURF_NETWORK_ELEMENT_AS, current_routing); + simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name_, SURF_NETWORK_ELEMENT_AS, current_routing); if (current_routing == NULL && routing_platf->p_root == NULL) { /* it is the first one */ - new_as->p_routingFather = NULL; + new_as->father_ = NULL; routing_platf->p_root = new_as; netcard->setId(-1); } else if (current_routing != NULL && routing_platf->p_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, + xbt_lib_set(as_router_lib, netcard->name(), ROUTING_ASR_LEVEL, (void *) netcard); - XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, netcard->getId()); + 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); @@ -218,7 +236,7 @@ void routing_AS_end() { 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 */ @@ -252,23 +270,23 @@ static void elements_father(sg_netcard_t src, sg_netcard_t dst, /* (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(); + src_as = src_data->containingAS(); + dst_as = dst_data->containingAS(); #ifndef NDEBUG - char* src_name = src_data->getName(); - char* dst_name = dst_data->getName(); + char* src_name = src_data->name(); + char* dst_name = dst_data->name(); #endif xbt_assert(src_as && dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found", src_name, dst_name); /* (2) find the path to the root routing component */ - for (current = src_as; current != NULL; current = current->p_routingFather) { + for (current = src_as; current != NULL; current = current->father_) { if (index_src >= ELEMENTS_FATHER_MAXDEPTH) xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_src"); path_src[index_src++] = current; } - for (current = dst_as; current != NULL; current = current->p_routingFather) { + for (current = dst_as; current != NULL; current = current->father_) { if (index_dst >= ELEMENTS_FATHER_MAXDEPTH) xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_dst"); path_dst[index_dst++] = current; @@ -315,13 +333,13 @@ static void _get_route_and_latency( 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); + common_father->name_, src_father->name_, dst_father->name_); /* Check whether a direct bypass is defined */ sg_platf_route_cbarg_t e_route_bypass = NULL; @@ -348,14 +366,14 @@ static void _get_route_and_latency( 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; + simgrid::surf::NetCard *src_father_netcard = src_father->netcard_; + simgrid::surf::NetCard *dst_father_netcard = dst_father->netcard_; 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()); + "bad gateways for route from \"%s\" to \"%s\"", src->name(), dst->name()); sg_netcard_t src_gateway_net_elm = route.gw_src; sg_netcard_t dst_gateway_net_elm = route.gw_dst; @@ -398,7 +416,7 @@ namespace surf { */ 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; @@ -407,7 +425,7 @@ void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t* r _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()); + "negative latency on route between \"%s\" and \"%s\"", src->name(), dst->name()); } xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){ @@ -427,7 +445,7 @@ xbt_dynar_t RoutingPlatf::recursiveGetOneLinkRoutes(As *rc) char *key; xbt_dict_cursor_t cursor = NULL; AS_t rc_child; - xbt_dict_foreach(rc->p_routingSons, cursor, key, 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); @@ -456,14 +474,14 @@ void routing_model_create( void *loopback) /* ************************************************************************** */ /* ************************* 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(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->p_backbone, "Cluster %s already has a backbone link!", cluster->name_); - cluster->p_backbone = static_cast(bb); - XBT_DEBUG("Add a backbone to AS '%s'", current_routing->p_name); + cluster->p_backbone = bb; + XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name_); } void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) @@ -779,7 +797,7 @@ static void finalize_rec(simgrid::surf::As *as) { 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); } @@ -812,7 +830,7 @@ AS_t surf_AS_get_routing_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( @@ -823,10 +841,10 @@ 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; @@ -845,18 +863,18 @@ simgrid::surf::As *surf_AS_get_by_name(const char * name) 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); }