X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2b5a32d440ace6920ebbe5b5425aedd515d11708..f22a365751c586e7d4d9836824730685a30a485c:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index fbc8c5ce9d..9b64a4ec83 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -5,14 +5,10 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "surf_routing.hpp" -#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_cluster_fat_tree.hpp" @@ -20,6 +16,9 @@ #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 + +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); @@ -35,33 +34,174 @@ namespace surf { {} As::~As() { - xbt_dict_free(&sons_); + xbt_dict_cursor_t cursor = NULL; + char *key; + AS_t elem; + xbt_dict_foreach(children_, cursor, key, elem) { + delete (As*)elem; + } + + + xbt_dict_free(&children_); xbt_dynar_free(&vertices_); xbt_dynar_free(&upDownLinks); + for (auto &kv : bypassRoutes_) + delete kv.second; xbt_free(name_); - if (netcard_) - delete netcard_; + delete netcard_; + } + void As::Seal() + { + sealed_ = true; } - sg_platf_route_cbarg_t As::getBypassRoute(NetCard * /*src*/, NetCard * /*dst*/, double * /*lat*/) { + xbt_dynar_t As::getOneLinkRoutes() { return NULL; } - int As::addComponent(NetCard *elm) { - XBT_DEBUG("Load component \"%s\"", elm->getName()); + 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::addRoute(sg_platf_route_cbarg_t /*route*/){ + xbt_die("AS %s does not accept new routes (wrong class).",name_); } - void As::parseASroute(sg_platf_route_cbarg_t /*route*/){ - THROW_IMPOSSIBLE; + + std::vector *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_.empty()) + return nullptr; + + std::vector *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::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){ - THROW_IMPOSSIBLE; + + void As::addBypassRoute(sg_platf_route_cbarg_t e_route){ + const char *src = e_route->src; + const char *dst = e_route->dst; + + 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(!e_route->link_list->empty(), "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(!e_route->link_list->empty(), "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 a copy that will be stored in the dict */ + std::vector *newRoute = new std::vector(); + for (auto link: *e_route->link_list) + newRoute->push_back(link); + + /* Store it */ + bypassRoutes_.insert({route_name, newRoute}); + xbt_free(route_name); } }} // namespace simgrid::surf @@ -92,10 +232,10 @@ int ROUTING_PROP_ASR_LEVEL; //Where the properties are stored 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 */ @@ -126,12 +266,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->upDownLinks) > netcard->getId() && - xbt_dynar_get_as(current_routing->upDownLinks, 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->upDownLinks, 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) @@ -164,7 +304,7 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) { 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 @@ -189,14 +329,14 @@ 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->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->father_ = NULL; - routing_platf->p_root = new_as; + 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->sons_, AS->id), + xbt_assert(!xbt_dict_get_or_null(current_routing->children_, AS->id), "The AS \"%s\" already exists", AS->id); /* it is a part of the tree */ new_as->father_ = current_routing; @@ -204,17 +344,15 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) if (current_routing->hierarchy_ == SURF_ROUTING_NULL) current_routing->hierarchy_ = SURF_ROUTING_RECURSIVE; /* add to the sons dictionary */ - xbt_dict_set(current_routing->sons_, AS->id, - (void *) new_as, NULL); + xbt_dict_set(current_routing->children_, AS->id, (void *) new_as, NULL); /* add to the father element list */ 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->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; @@ -229,11 +367,6 @@ void routing_AS_begin(sg_platf_AS_cbarg_t AS) * * Once you've declared all the content of your AS, you have to close * it with this call. Your AS is not usable until you call this function. - * - * @fixme: this call is not as robust as wanted: bad things WILL happen - * if you call it twice for the same AS, or if you forget calling it, or - * even if you add stuff to a closed AS - * */ void routing_AS_end() { @@ -242,8 +375,6 @@ void routing_AS_end() current_routing = current_routing->father_; } -/* Aux Business methods */ - /** * \brief Get the AS father and the first elements of the chain * @@ -254,44 +385,34 @@ void routing_AS_end() * father in the chain */ static void elements_father(sg_netcard_t src, sg_netcard_t dst, - AS_t * res_father, - AS_t * res_src, - AS_t * res_dst) + AS_t * res_father, AS_t * res_src, 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->father_) { - 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->father_) { - 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; } @@ -312,31 +433,25 @@ static void elements_father(sg_netcard_t src, sg_netcard_t dst, *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, - xbt_dynar_t * links, double *latency) +static void _get_route_and_latency(simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst, + std::vector * 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; @@ -344,60 +459,42 @@ static void _get_route_and_latency( XBT_DEBUG("elements_father: common father '%s' src_father '%s' dst_father '%s'", 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; - //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); + /* Check whether a direct bypass is defined. If so, use it and bail out */ + std::vector *bypassed_route = common_father->getBypassRoute(src, dst); + if (nullptr != bypassed_route) { + for (Link *link : *bypassed_route) { + links->push_back(link); + if (latency) + *latency += link->getLatency(); + } return; } /* If src and dst are in the same AS, life is good */ if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - route.link_list = *links; + 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->netcard_; - simgrid::surf::NetCard *dst_father_netcard = dst_father->netcard_; - - common_father->getRouteAndLatency(src_father_netcard, dst_father_netcard, - &route, latency); + route.link_list = new std::vector(); + 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); - xbt_dynar_merge(links, &route.link_list); + if (src != route.gw_src) + _get_route_and_latency(src, route.gw_src, links, latency); + for (auto link: *route.link_list) + links->push_back(link); /* 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); - -} + if (route.gw_dst != dst) + _get_route_and_latency(route.gw_dst, dst, links, latency); -AS_t surf_platf_get_root(routing_platf_t platf){ - return platf->p_root; -} - -e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_netcard_t netcard){ - return netcard->getRcType(); } namespace simgrid { @@ -417,25 +514,14 @@ namespace surf { * 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, xbt_dynar_t* route, double *latency) +void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, std::vector * route, double *latency) { - XBT_DEBUG("getRouteAndLatency from %s to %s", src->getName(), dst->getName()); - if (NULL == *route) { - xbt_dynar_reset(routing_platf->p_lastRoute); - *route = routing_platf->p_lastRoute; - } + XBT_DEBUG("getRouteAndLatency from %s to %s", src->name(), dst->name()); _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); @@ -448,28 +534,23 @@ xbt_dynar_t RoutingPlatf::recursiveGetOneLinkRoutes(As *rc) char *key; xbt_dict_cursor_t cursor = NULL; AS_t rc_child; - xbt_dict_foreach(rc->sons_, cursor, key, rc_child) { - xbt_dynar_t onelink_child = recursiveGetOneLinkRoutes(rc_child); + xbt_dict_foreach(rc->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_); } -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 */ -void routing_model_create( void *loopback) +void routing_model_create(Link *loopback) { routing_platf = new simgrid::surf::RoutingPlatf(loopback); } @@ -481,9 +562,9 @@ 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->name_); + xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->name_); - cluster->p_backbone = bb; + cluster->backbone_ = bb; XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name_); } @@ -515,14 +596,11 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) } s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER; memset(&host, 0, sizeof(host)); - host.initiallyOn = 1; host.pstate = 0; - host.speed_scale = 1.0; host.core_amount = 1; s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER; memset(&link, 0, sizeof(link)); - link.initiallyOn = 1; link.policy = SURF_LINK_FULLDUPLEX; link.latency = cabinet->lat; link.bandwidth = cabinet->bw; @@ -569,9 +647,9 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) char *router_id = NULL; XBT_DEBUG(" "); - host_id = HOST_PEER(peer->id); - link_id = LINK_PEER(peer->id); - router_id = ROUTER_PEER(peer->id); + host_id = bprintf("peer_%s", peer->id); + link_id = bprintf("link_%s", peer->id); + router_id = bprintf("router_%s", peer->id); XBT_DEBUG("", peer->id); s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; @@ -582,14 +660,12 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) XBT_DEBUG("", host_id, peer->speed); s_sg_platf_host_cbarg_t host = SG_PLATF_HOST_INITIALIZER; memset(&host, 0, sizeof(host)); - host.initiallyOn = 1; host.id = host_id; host.speed_peak = xbt_dynar_new(sizeof(double), NULL); xbt_dynar_push(host.speed_peak,&peer->speed); host.pstate = 0; //host.power_peak = peer->power; - host.speed_scale = 1.0; host.speed_trace = peer->availability_trace; host.state_trace = peer->state_trace; host.core_amount = 1; @@ -598,7 +674,6 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER; memset(&link, 0, sizeof(link)); - link.initiallyOn = 1; link.policy = SURF_LINK_SHARED; link.latency = peer->lat; @@ -630,7 +705,7 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) router.id = router_id; router.coord = peer->coord; sg_platf_new_router(&router); - static_cast(current_routing)->p_router = static_cast(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL)); + static_cast(current_routing)->router_ = static_cast(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL)); XBT_DEBUG(""); sg_platf_new_AS_end(); @@ -644,126 +719,6 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) free(link_down); } -// static void routing_parse_Srandom(void) -// { -// double mean, std, min, max, seed; -// char *random_id = A_surfxml_random_id; -// char *random_radical = A_surfxml_random_radical; -// char *rd_name = NULL; -// char *rd_value; -// mean = surf_parse_get_double(A_surfxml_random_mean); -// std = surf_parse_get_double(A_surfxml_random_std___deviation); -// min = surf_parse_get_double(A_surfxml_random_min); -// max = surf_parse_get_double(A_surfxml_random_max); -// seed = surf_parse_get_double(A_surfxml_random_seed); - -// double res = 0; -// int i = 0; -// random_data_t random = xbt_new0(s_random_data_t, 1); -// char *tmpbuf; - -// xbt_dynar_t radical_elements; -// unsigned int iter; -// char *groups; -// int start, end; -// xbt_dynar_t radical_ends; - -// switch (A_surfxml_random_generator) { -// case AU_surfxml_random_generator: -// case A_surfxml_random_generator_NONE: -// random->generator = NONE; -// break; -// case A_surfxml_random_generator_DRAND48: -// random->generator = DRAND48; -// break; -// case A_surfxml_random_generator_RAND: -// random->generator = RAND; -// break; -// case A_surfxml_random_generator_RNGSTREAM: -// random->generator = RNGSTREAM; -// break; -// default: -// surf_parse_error("Invalid random generator"); -// break; -// } -// random->seed = seed; -// random->min = min; -// random->max = max; - -// /* Check user stupidities */ -// if (max < min) -// THROWF(arg_error, 0, "random->max < random->min (%f < %f)", max, min); -// if (mean < min) -// THROWF(arg_error, 0, "random->mean < random->min (%f < %f)", mean, min); -// if (mean > max) -// THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean, max); - -// /* normalize the mean and standard deviation before storing */ -// random->mean = (mean - min) / (max - min); -// random->std = std / (max - min); - -// if (random->mean * (1 - random->mean) < random->std * random->std) -// THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)", -// random->mean, random->std); - -// XBT_DEBUG -// ("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'", -// random_id, random->min, random->max, random->mean, random->std, -// (int)random->generator, random->seed, random_radical); - -// if (!random_value) -// random_value = xbt_dict_new_homogeneous(free); - -// if (!strcmp(random_radical, "")) { -// res = random_generate(random); -// rd_value = bprintf("%f", res); -// xbt_dict_set(random_value, random_id, rd_value, NULL); -// } else { -// radical_elements = xbt_str_split(random_radical, ","); -// xbt_dynar_foreach(radical_elements, iter, groups) { -// radical_ends = xbt_str_split(groups, "-"); -// switch (xbt_dynar_length(radical_ends)) { -// case 1: -// xbt_assert(!xbt_dict_get_or_null(random_value, random_id), -// "Custom Random '%s' already exists !", random_id); -// res = random_generate(random); -// tmpbuf = -// bprintf("%s%d", random_id, -// atoi(xbt_dynar_getfirst_as(radical_ends, char *))); -// xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL); -// xbt_free(tmpbuf); -// break; - -// case 2: -// start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); -// end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); -// for (i = start; i <= end; i++) { -// xbt_assert(!xbt_dict_get_or_null(random_value, random_id), -// "Custom Random '%s' already exists !", bprintf("%s%d", -// random_id, -// i)); -// res = random_generate(random); -// tmpbuf = bprintf("%s%d", random_id, i); -// xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL); -// xbt_free(tmpbuf); -// } -// break; -// default: -// XBT_CRITICAL("Malformed radical"); -// break; -// } -// res = random_generate(random); -// rd_name = bprintf("%s_router", random_id); -// rd_value = bprintf("%f", res); -// xbt_dict_set(random_value, rd_name, rd_value, NULL); - -// xbt_dynar_free(&radical_ends); -// } -// free(rd_name); -// xbt_dynar_free(&radical_elements); -// } -// } - static void check_disk_attachment() { xbt_lib_cursor_t cursor; @@ -787,26 +742,6 @@ void routing_register_callbacks() instr_routing_define_callbacks(); } -/** - * \brief Recursive function for finalize - * - * \param rc the source host name - * - * This fuction is call by "finalize". It allow to finalize the - * AS or routing components. It delete all the structures. - */ -static void finalize_rec(simgrid::surf::As *as) { - xbt_dict_cursor_t cursor = NULL; - char *key; - AS_t elem; - - xbt_dict_foreach(as->sons_, cursor, key, elem) { - finalize_rec(elem); - } - - delete as;; -} - /** \brief Frees all memory allocated by the routing module */ void routing_exit(void) { delete routing_platf; @@ -815,29 +750,27 @@ void routing_exit(void) { namespace simgrid { namespace surf { - RoutingPlatf::RoutingPlatf(void *loopback) - : p_loopback(loopback) + RoutingPlatf::RoutingPlatf(Link *loopback) + : loopback_(loopback) { } RoutingPlatf::~RoutingPlatf() { - xbt_dynar_free(&p_lastRoute); - finalize_rec(p_root); + delete 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->name_; } -static simgrid::surf::As *surf_AS_recursive_get_by_name( - simgrid::surf::As *current, const char * name) +static simgrid::surf::As *surf_AS_recursive_get_by_name(simgrid::surf::As *current, const char * name) { xbt_dict_cursor_t cursor = NULL; char *key; @@ -847,7 +780,7 @@ static simgrid::surf::As *surf_AS_recursive_get_by_name( if(!strcmp(current->name_, name)) return current; - xbt_dict_foreach(current->sons_, cursor, key, elem) { + xbt_dict_foreach(current->children_, cursor, key, elem) { tmp = surf_AS_recursive_get_by_name(elem, name); if(tmp != NULL ) { break; @@ -858,15 +791,15 @@ static simgrid::surf::As *surf_AS_recursive_get_by_name( 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) +xbt_dict_t surf_AS_get_children(simgrid::surf::As *as) { - return as->sons_; + return as->children_; } xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as) @@ -877,7 +810,7 @@ xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as) 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); }