X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/33d9244599867b2daca6df5ae07fa5505571e9d8..75e8415d3b5fbec784b77b485da05ccbd0256d93:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index a9e42cc973..83e08a1def 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -14,53 +14,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route,surf,"Routing part of surf"); - -// FIXME: the next two lines cant be comented without fix the code in network.c file. -// routing_t used_routing = NULL; -// xbt_dict_t onelink_routes = NULL; - -// -// /* Prototypes of each model */ -// static void routing_model_full_create(size_t size_of_link,void *loopback); -// // static void routing_model_floyd_create(size_t size_of_link, void*loopback); -// // static void routing_model_dijkstra_create(size_t size_of_link, void*loopback); -// // static void routing_model_dijkstracache_create(size_t size_of_link, void*loopback); -// //static void routing_model_none_create(size_t size_of_link, void*loopback); -// -// /* Definition of each model */ -// struct model_type { -// const char *name; -// const char *desc; -// void (*fun)(size_t,void*); -// }; -// -// struct model_type models[] = -// { {"Full", "Full routing data (fast, large memory requirements, fully expressive)", routing_model_full_create }, -// // {"Floyd", "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)", routing_model_floyd_create }, -// // {"Dijkstra", "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)", routing_model_dijkstra_create }, -// // {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", routing_model_dijkstracache_create }, -// // {"none", "No routing (usable with Constant network only)", routing_model_none_create }, -// {NULL,NULL,NULL}}; - -//////////////////////////////////////////////////////////////////////////////// -// HERE START THE NEW CODE -//////////////////////////////////////////////////////////////////////////////// - -//...... DEBUG ONLY .... // -static void print_tree(routing_component_t rc); -static void print_global(); -static void print_AS_start(void); -static void print_AS_end(void); -static void print_host(void); -static void print_link(void); -static void print_route(void); -static void print_ctn(void); -static void DEBUG_exit(void); - -//////////////////////////////////////////////////////////////////////////////// -// HERE START THE NEW CODE -//////////////////////////////////////////////////////////////////////////////// - /* Global vars */ routing_global_t global_routing = NULL; routing_component_t current_routing = NULL; @@ -77,46 +30,66 @@ static void model_floyd_load(void); /* load parse functions for floyd routing static void model_floyd_unload(void); /* unload parse functions for floyd routing model */ static void model_floyd_end(void); /* finalize the creation of floyd routing model */ -static void* model_dijkstra_create(void); /* create structures for dijkstra routing model */ -static void model_dijkstra_load(void); /* load parse functions for dijkstra routing model */ -static void model_dijkstra_unload(void); /* unload parse functions for dijkstra routing model */ -static void model_dijkstra_end(void); /* finalize the creation of dijkstra routing model */ - +static void* model_dijkstra_both_create(int cached); /* create by calling dijkstra or dijkstracache */ +static void* model_dijkstra_create(void); /* create structures for dijkstra routing model */ static void* model_dijkstracache_create(void); /* create structures for dijkstracache routing model */ -static void model_dijkstracache_load(void); /* load parse functions for dijkstracache routing model */ -static void model_dijkstracache_unload(void); /* unload parse functions for dijkstracache routing model */ -static void model_dijkstracache_end(void); /* finalize the creation of dijkstracache routing model */ +static void model_dijkstra_both_load(void); /* load parse functions for dijkstra routing model */ +static void model_dijkstra_both_unload(void); /* unload parse functions for dijkstra routing model */ +static void model_dijkstra_both_end(void); /* finalize the creation of dijkstra routing model */ static void* model_none_create(void); /* none routing model */ static void model_none_load(void); /* none routing model */ static void model_none_unload(void); /* none routing model */ static void model_none_end(void); /* none routing model */ -/* Table of routing models */ -/* must be finish with null and carefull if change de order */ - -#define SURF_MODEL_FULL 0 -#define SURF_MODEL_FLOYD 1 -#define SURF_MODEL_DIJKSTRA 2 -#define SURF_MODEL_DIJKSTRACACHE 3 -#define SURF_MODEL_NONE 4 +/* this lines are olny for replace use like index in the model table */ +#define SURF_MODEL_FULL 0 +#define SURF_MODEL_FLOYD 1 +#define SURF_MODEL_DIJKSTRA 2 +#define SURF_MODEL_DIJKSTRACACHE 3 +#define SURF_MODEL_NONE 4 +/* must be finish with null and carefull if change de order */ struct s_model_type routing_models[] = { {"Full", "Full routing data (fast, large memory requirements, fully expressive)", model_full_create, model_full_load, model_full_unload, model_full_end }, {"Floyd", "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)", model_floyd_create, model_floyd_load, model_floyd_unload, model_floyd_end }, {"Dijkstra", "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)", - model_dijkstra_create ,model_dijkstra_load, model_dijkstra_unload, model_dijkstra_end }, + model_dijkstra_create ,model_dijkstra_both_load, model_dijkstra_both_unload, model_dijkstra_both_end }, {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", - model_dijkstracache_create, model_dijkstracache_load, model_dijkstracache_unload, model_dijkstracache_end }, + model_dijkstracache_create, model_dijkstra_both_load, model_dijkstra_both_unload, model_dijkstra_both_end }, {"none", "No routing (usable with Constant network only)", model_none_create, model_none_load, model_none_unload, model_none_end }, {NULL,NULL,NULL,NULL,NULL,NULL}}; +/* ************************************************************************** */ +/* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */ + +static void generic_set_processing_units(routing_component_t rc, const char* name); +static void generic_set_autonomous_system(routing_component_t rc, const char* name); +static void generic_set_route(routing_component_t rc, const char* src, const char* dst, route_t route); +static void generic_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route); +static void generic_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route); + +/* ************************************************************************** */ +/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */ + +static route_extended_t generic_get_bypassroute(routing_component_t rc, const char* src, const char* dst); + +/* ************************************************************************** */ +/* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */ + +static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void* data, int order); +static void generic_free_extended_route(route_extended_t e_route); +static routing_component_t generic_autonomous_system_exist(routing_component_t rc, char* element); +static routing_component_t generic_processing_units_exist(routing_component_t rc, char* element); +static void generic_src_dst_check(routing_component_t rc, const char* src, const char* dst); + +/* ************************************************************************** */ +/* **************************** GLOBAL FUNCTIONS **************************** */ /* global parse functions */ - static char* src = NULL; /* temporary store the source name of a route */ static char* dst = NULL; /* temporary store the destination name of a route */ static char* gw_src = NULL; /* temporary store the gateway source name of a route */ @@ -130,9 +103,8 @@ static void parse_S_host(void) { if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE; xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,A_surfxml_host_id), "Reading a host, processing unit \"%s\" already exist",A_surfxml_host_id); -// FIXME: checked by parser -// xbt_assert1(current_routing->hierarchy==SURF_ROUTING_BASE, -// "Bad declaration of processing unit \"%s\"",A_surfxml_host_id); + xbt_assert1(current_routing->set_processing_units, + "no defined method \"set_processing_units\" in \"%s\"",current_routing->name); (*(current_routing->set_processing_units))(current_routing,A_surfxml_host_id); xbt_dict_set(global_routing->where_network_elements,A_surfxml_host_id,(void*)current_routing,NULL); } @@ -144,65 +116,92 @@ static void parse_S_router(void) { if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_BASE; xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,A_surfxml_router_id), "Reading a router, processing unit \"%s\" already exist",A_surfxml_router_id); -// FIXME: checked by parser -// xbt_assert1(current_routing->hierarchy==SURF_ROUTING_BASE, -// "Bad declaration of processing unit \"%s\"",A_surfxml_host_id); + xbt_assert1(current_routing->set_processing_units, + "no defined method \"set_processing_units\" in \"%s\"",current_routing->name); (*(current_routing->set_processing_units))(current_routing,A_surfxml_router_id); xbt_dict_set(global_routing->where_network_elements,A_surfxml_router_id,(void*)current_routing,NULL); } +/** + * \brief Set the endponints for a route + */ static void parse_S_route_new_and_endpoints(void) { - // FIXME: checked by parser -// xbt_assert1(current_routing->hierarchy==SURF_ROUTING_BASE, -// "Bad declaration of route in \"%s\"",current_routing->name); if( src != NULL && dst != NULL && link_list != NULL ) THROW2(arg_error,0,"Route between %s to %s can not be defined",A_surfxml_route_src,A_surfxml_route_dst); src = A_surfxml_route_src; dst = A_surfxml_route_dst; + xbt_assert2(strlen(src)>0||strlen(dst)>0, + "Some limits are null in the route between \"%s\" and \"%s\"",src,dst); link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref); } +/** + * \brief Set the endponints and gateways for a ASroute + */ static void parse_S_ASroute_new_and_endpoints(void) { -// FIXME: checked by parser -// xbt_assert1(current_routing->hierarchy==SURF_ROUTING_RECURSIVE, -// "Bad declaration of ASroute in \"%s\"",current_routing->name); if( src != NULL && dst != NULL && link_list != NULL ) THROW2(arg_error,0,"Route between %s to %s can not be defined",A_surfxml_ASroute_src,A_surfxml_ASroute_dst); src = A_surfxml_ASroute_src; dst = A_surfxml_ASroute_dst; gw_src = A_surfxml_ASroute_gw_src; gw_dst = A_surfxml_ASroute_gw_dst; + xbt_assert2(strlen(src)>0||strlen(dst)>0||strlen(gw_src)>0||strlen(gw_dst)>0, + "Some limits are null in the route between \"%s\" and \"%s\"",src,dst); + link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref); +} + +/** + * \brief Set the endponints for a bypassRoute + */ +static void parse_S_bypassRoute_new_and_endpoints(void) { + if( src != NULL && dst != NULL && link_list != NULL ) + THROW2(arg_error,0,"Bypass Route between %s to %s can not be defined",A_surfxml_bypassRoute_src,A_surfxml_bypassRoute_dst); + src = A_surfxml_bypassRoute_src; + dst = A_surfxml_bypassRoute_dst; + gw_src = A_surfxml_bypassRoute_gw_src; + gw_dst = A_surfxml_bypassRoute_gw_dst; + xbt_assert2(strlen(src)>0||strlen(dst)>0||strlen(gw_src)>0||strlen(gw_dst)>0, + "Some limits are null in the route between \"%s\" and \"%s\"",src,dst); link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref); } +/** + * \brief Set a new link on the actual list of link for a route or ASroute + */ static void parse_E_link_c_ctn_new_elem(void) { char *val; val = xbt_strdup(A_surfxml_link_c_ctn_id); xbt_dynar_push(link_list, &val); } +/** + * \brief Store the route by calling the set_route function of the current routing component + */ static void parse_E_route_store_route(void) { -// FIXME: checked by parser -// xbt_assert1(current_routing->hierarchy==SURF_ROUTING_BASE, -// "Bad declaration of route in \"%s\"",current_routing->name); - route_t route = xbt_new(s_route_t,1); + route_t route = xbt_new0(s_route_t,1); route->link_list = link_list; - // TODO check if are correct + xbt_assert1(generic_processing_units_exist(current_routing,src),"the \"%s\" processing units gateway does not exist",src); + xbt_assert1(generic_processing_units_exist(current_routing,dst),"the \"%s\" processing units gateway does not exist",dst); + xbt_assert1(current_routing->set_route,"no defined method \"set_route\" in \"%s\"",current_routing->name); (*(current_routing->set_route))(current_routing,src,dst,route); link_list = NULL; src = NULL; dst = NULL; } +/** + * \brief Store the ASroute by calling the set_ASroute function of the current routing component + */ static void parse_E_ASroute_store_route(void) { -// FIXME: checked by parser -// xbt_assert1(current_routing->hierarchy==SURF_ROUTING_RECURSIVE, -// "Bad declaration of ASroute in \"%s\"",current_routing->name); - route_extended_t e_route = xbt_new(s_route_extended_t,1); + route_extended_t e_route = xbt_new0(s_route_extended_t,1); e_route->generic_route.link_list = link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); - // TODO check if are correct + xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src); + xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst); + xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src); + xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst); + xbt_assert1(current_routing->set_ASroute,"no defined method \"set_ASroute\" in \"%s\"",current_routing->name); (*(current_routing->set_ASroute))(current_routing,src,dst,e_route); link_list = NULL; src = NULL; @@ -211,6 +210,27 @@ static void parse_E_ASroute_store_route(void) { gw_dst = NULL; } +/** + * \brief Store the bypass route by calling the set_bypassroute function of the current routing component + */ +static void parse_E_bypassRoute_store_route(void) { + route_extended_t e_route = xbt_new0(s_route_extended_t,1); + e_route->generic_route.link_list = link_list; + e_route->src_gateway = xbt_strdup(gw_src); + e_route->dst_gateway = xbt_strdup(gw_dst); + xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src); + xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst); + xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src); + xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst); + xbt_assert1(current_routing->set_bypassroute,"no defined method \"set_bypassroute\" in \"%s\"",current_routing->name); + (*(current_routing->set_bypassroute))(current_routing,src,dst,e_route); + link_list = NULL; + src = NULL; + dst = NULL; + gw_src = NULL; + gw_dst = NULL; +} + /** * \brief Make a new routing component * @@ -232,24 +252,11 @@ static void parse_S_AS(void) { for (cpt=0;routing_models[cpt].name;cpt++) if (!strcmp(wanted,routing_models[cpt].name)) fprintf(stderr," %s: %s\n",routing_models[cpt].name,routing_models[cpt].desc); - exit(1); + xbt_die(NULL); } /* make a new routing component */ new_routing = (routing_component_t)(*(model->create))(); - - /* FIXME: for now, if I forget to declare */ - xbt_assert1( new_routing->set_processing_units, - "Bad routing type, \"set_processing_units\" is not declared for \"%s\"",A_surfxml_AS_id); - xbt_assert1( new_routing->set_autonomous_system, - "Bad routing type, \"set_autonomous_system\" is not declared for \"%s\"",A_surfxml_AS_id); - xbt_assert1( new_routing->set_route, - "Bad routing type, \"set_route\" is not declared for \"%s\"",A_surfxml_AS_id); - xbt_assert1( new_routing->set_ASroute, - "Bad routing type, \"set_ASroute\" is not declared for \"%s\"",A_surfxml_AS_id); - xbt_assert1( new_routing->finalize, - "Bad routing type, \"finalize\" is not declared for \"%s\"",A_surfxml_AS_id); - new_routing->routing = model; new_routing->hierarchy = SURF_ROUTING_NULL; new_routing->name = xbt_strdup(A_surfxml_AS_id); @@ -270,9 +277,6 @@ static void parse_S_AS(void) { new_routing->routing_father = current_routing; /* set the father behavior */ if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_RECURSIVE; -// FIXME: checked by parser -// xbt_assert1(current_routing->hierarchy==SURF_ROUTING_RECURSIVE, -// "Bad declaration of AS \"%s\"",A_surfxml_AS_id); /* add to the sons dictionary */ xbt_dict_set(current_routing->routing_sons,A_surfxml_AS_id,(void*)new_routing,NULL); /* add to the father element list */ @@ -300,6 +304,9 @@ static void parse_E_AS(void) { if( current_routing == NULL ) { THROW1(arg_error,0,"Close AS(%s), that never open",A_surfxml_AS_id); } else { + xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,current_routing->name), + "The AS \"%s\" already exist",current_routing->name); + xbt_dict_set(global_routing->where_network_elements,current_routing->name,current_routing->routing_father,NULL); (*(current_routing->routing->unload))(); (*(current_routing->routing->end))(); current_routing = current_routing->routing_father; @@ -308,39 +315,22 @@ static void parse_E_AS(void) { } } -/** - * \brief Recursive function for add the differents AS to global dict - * - * This fuction is call by "parse_E_platform_add_parse_AS". It allow to add the - * AS or routing components, to the where_network_elements dictionary. In the same - * way as "parse_S_host", "parse_S_router" and "parse_S_gateway" do. - */ -static void _add_parse_AS(routing_component_t rc) { - xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,rc->name), - "The AS \"%s\" already exist",rc->name); - xbt_dict_set(global_routing->where_network_elements,rc->name,rc->routing_father,NULL); - xbt_dict_cursor_t cursor = NULL; - char *key; - routing_component_t elem; - xbt_dict_foreach(rc->routing_sons, cursor, key, elem) { - _add_parse_AS(elem); - } -} +/* Aux Business methods */ /** - * \brief Add a "AS" to the network element list + * \brief Get the AS father and the first elements of the chain * - * Allows find a "AS" in any routing component + * \param src the source host name + * \param dst the destination host name + * + * Get the common father of the to processing units, and the first different + * father in the chain */ -static void parse_E_platform_add_parse_AS(void) { - _add_parse_AS(global_routing->root); -} - -/* Aux Business methods */ - static xbt_dynar_t elements_father(const char* src,const char* dst) { - xbt_dynar_t result = xbt_dynar_new(sizeof(char*), NULL); // &xbt_free_ref + xbt_assert0(src&&dst,"bad parameters for \"elements_father\" method"); + + xbt_dynar_t result = xbt_dynar_new(sizeof(char*), NULL); routing_component_t src_as, dst_as; int index_src, index_dst, index_father_src, index_father_dst; @@ -354,7 +344,7 @@ static xbt_dynar_t elements_father(const char* src,const char* dst) { /* (1) find the as where the src and dst are located */ src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src); dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst); - xbt_assert0(src_as != NULL && dst_as != NULL, "Ask for route \"from\" or \"to\" no found"); + xbt_assert2(src_as&&dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found",src,dst); /* (2) find the path to the root routing component */ path_src = xbt_dynar_new(sizeof(routing_component_t), NULL); @@ -396,9 +386,9 @@ static xbt_dynar_t elements_father(const char* src,const char* dst) { father = xbt_dynar_get_ptr(path_src,index_father_src); /* (5) result generation */ - xbt_dynar_push(result,father); // first same the father of src and dst - xbt_dynar_push(result,current_src); // second the first different father of src - xbt_dynar_push(result,current_dst); // three the first different father of dst + xbt_dynar_push(result,father); /* first same the father of src and dst */ + xbt_dynar_push(result,current_src); /* second the first different father of src */ + xbt_dynar_push(result,current_dst); /* three the first different father of dst */ xbt_dynar_free(&path_src); xbt_dynar_free(&path_dst); @@ -408,11 +398,15 @@ static xbt_dynar_t elements_father(const char* src,const char* dst) { /* Global Business methods */ -// typedef enum { -// SURF_LOCAL_SOLVE = 0, /**< No Local solve */ -// SURF_NO_LOCAL_SOLVE, /**< Local solve */ -// } e_surf_is_local_t; - +/** + * \brief Recursive function for get_route + * + * \param src the source host name + * \param dst the destination host name + * + * This fuction is call by "get_route". It allow to walk through the + * routing components tree. + */ static route_extended_t _get_route(const char* src,const char* dst) { void* link; @@ -420,7 +414,7 @@ static route_extended_t _get_route(const char* src,const char* dst) { DEBUG2("Solve route \"%s\" to \"%s\"",src,dst); - xbt_assert0(src&&dst,"bad parameters for _get_route method"); + xbt_assert0(src&&dst,"bad parameters for \"_get_route\" method"); route_extended_t e_route, e_route_cnt, e_route_src, e_route_dst; @@ -439,50 +433,64 @@ static route_extended_t _get_route(const char* src,const char* dst) { if( strcmp(src,dst) ){ e_route_cnt = (*(common_father->get_route))(common_father,src,dst); + xbt_assert2(e_route_cnt,"no route between \"%s\" and \"%s\"",src,dst); xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { xbt_dynar_push(e_route->generic_route.link_list,&link); } + xbt_dynar_free( &(e_route_cnt->generic_route.link_list) ); + xbt_free(e_route_cnt); } } else { /* SURF_ROUTING_RECURSIVE */ + + route_extended_t e_route_bypass = (*(common_father->get_bypass_route))(common_father,src,dst); + if(e_route_bypass) + e_route_cnt = e_route_bypass; + else e_route_cnt = (*(common_father->get_route))(common_father,src_father->name,dst_father->name); - - xbt_assert2( (e_route_cnt->src_gateway==NULL) == (e_route_cnt->dst_gateway==NULL) , - "bad gateway for route between \"%s\" and \"%s\"",src,dst); - - if( src != e_route_cnt->src_gateway ) { - e_route_src = _get_route(src,e_route_cnt->src_gateway); - xbt_dynar_foreach(e_route_src->generic_route.link_list, cpt, link) { - xbt_dynar_push(e_route->generic_route.link_list,&link); - } - } - - xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { + + xbt_assert2(e_route_cnt,"no route between \"%s\" and \"%s\"",src_father->name,dst_father->name); + + xbt_assert2( (e_route_cnt->src_gateway==NULL) == (e_route_cnt->dst_gateway==NULL) , + "bad gateway for route between \"%s\" and \"%s\"",src,dst); + + if( src != e_route_cnt->src_gateway ) { + e_route_src = _get_route(src,e_route_cnt->src_gateway); + xbt_assert2(e_route_src,"no route between \"%s\" and \"%s\"",src,e_route_cnt->src_gateway); + xbt_dynar_foreach(e_route_src->generic_route.link_list, cpt, link) { xbt_dynar_push(e_route->generic_route.link_list,&link); } - - if( e_route_cnt->dst_gateway != dst ) { - e_route_dst = _get_route(e_route_cnt->dst_gateway,dst); - xbt_dynar_foreach(e_route_dst->generic_route.link_list, cpt, link) { - xbt_dynar_push(e_route->generic_route.link_list,&link); - } + } + + xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { + xbt_dynar_push(e_route->generic_route.link_list,&link); + } + + if( e_route_cnt->dst_gateway != dst ) { + e_route_dst = _get_route(e_route_cnt->dst_gateway,dst); + xbt_assert2(e_route_dst,"no route between \"%s\" and \"%s\"",e_route_cnt->dst_gateway,dst); + xbt_dynar_foreach(e_route_dst->generic_route.link_list, cpt, link) { + xbt_dynar_push(e_route->generic_route.link_list,&link); } - - e_route->src_gateway = e_route_cnt->src_gateway; - e_route->dst_gateway = e_route_cnt->dst_gateway; - - xbt_dynar_free( &(e_route_src->generic_route.link_list) ); - xbt_free(e_route_src); - xbt_dynar_free( &(e_route_cnt->generic_route.link_list) ); - xbt_free(e_route_cnt); - xbt_dynar_free( &(e_route_dst->generic_route.link_list) ); - xbt_free(e_route_dst); + } + + e_route->src_gateway = e_route_cnt->src_gateway; + e_route->dst_gateway = e_route_cnt->dst_gateway; + + xbt_dynar_free( &(e_route_src->generic_route.link_list) ); + xbt_free(e_route_src); + xbt_dynar_free( &(e_route_cnt->generic_route.link_list) ); + xbt_free(e_route_cnt); + xbt_dynar_free( &(e_route_dst->generic_route.link_list) ); + xbt_free(e_route_dst); } + + xbt_dynar_free(&elem_father_list); + return e_route; } - /** * \brief Generic method: find a route between hosts * @@ -505,9 +513,11 @@ static xbt_dynar_t get_route(const char* src,const char* dst) { else e_route = (*(common_father->get_route))(common_father,src,dst); + xbt_assert2(e_route,"no route between \"%s\" and \"%s\"",src,dst); global_routing->last_route = e_route->generic_route.link_list; xbt_free(e_route); + xbt_dynar_free(&elem_father_list); if( xbt_dynar_length(global_routing->last_route)==0 ) return NULL; @@ -535,6 +545,7 @@ static void _finalize(routing_component_t rc) { char* tmp_name = rc->name; xbt_dict_free(&tmp_sons); xbt_free(tmp_name); + xbt_assert1(rc->finalize,"no defined method \"finalize\" in \"%s\"",current_routing->name); (*(rc->finalize))(rc); } } @@ -582,27 +593,22 @@ void routing_model_create(size_t size_of_links, void* loopback) { surfxml_add_callback(STag_surfxml_route_cb_list, &parse_S_route_new_and_endpoints); surfxml_add_callback(STag_surfxml_ASroute_cb_list, &parse_S_ASroute_new_and_endpoints); + surfxml_add_callback(STag_surfxml_bypassRoute_cb_list, &parse_S_bypassRoute_new_and_endpoints); surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &parse_E_link_c_ctn_new_elem); surfxml_add_callback(ETag_surfxml_route_cb_list, &parse_E_route_store_route); surfxml_add_callback(ETag_surfxml_ASroute_cb_list, &parse_E_ASroute_store_route); + surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, &parse_E_bypassRoute_store_route); surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS); surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS); - - /* set all the as in the global where table (recursive fuction) */ - surfxml_add_callback(ETag_surfxml_platform_cb_list, &parse_E_platform_add_parse_AS); - - /* DEBUG ONLY */ - //surfxml_add_callback(ETag_surfxml_platform_cb_list, &DEBUG_exit); - } /* ************************************************************************** */ /* *************************** FULL ROUTING ********************************* */ -#define TO_ROUTE_FULL(i,j,rc) ((routing_component_full_t)rc)->routing_table[(i)+(j)*xbt_dict_length(((routing_component_full_t)rc)->to_index)] +#define TO_ROUTE_FULL(i,j) routing->routing_table[(i)+(j)*table_size] /* Routing model structure */ @@ -610,107 +616,55 @@ typedef struct { s_routing_component_t generic_routing; xbt_dict_t parse_routes; /* store data during the parse process */ xbt_dict_t to_index; /* char* -> network_element_t */ + xbt_dict_t bypassRoutes; route_extended_t *routing_table; } s_routing_component_full_t,*routing_component_full_t; -/* Parse routing model functions */ - - /* Business methods */ -static void full_set_processing_units(routing_component_t rc, const char* name) { - DEBUG1("Full - Load process unit \"%s\"",name); - // TODO: SET or ERROR e_surf_routing_hierarchy_t hierarchical - int *id = xbt_new0(int,1); // xbt_malloc(sizeof(int)); ? - *id = xbt_dict_length(((routing_component_full_t)current_routing)->to_index); - xbt_dict_set(((routing_component_full_t)current_routing)->to_index,name,id,xbt_free); -} - -static void full_set_autonomous_system(routing_component_t rc, const char* name) { - DEBUG1("Full - Load Autonomous system \"%s\"",name); - // TODO: SET or ERROR e_surf_routing_hierarchy_t hierarchical - int *id = xbt_new0(int,1); // xbt_malloc(sizeof(int)); ? - *id = xbt_dict_length(((routing_component_full_t)current_routing)->to_index); - xbt_dict_set(((routing_component_full_t)current_routing)->to_index,name,id,xbt_free); -} - -static void full_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) { - DEBUG2("Full - Load Route from \"%s\" to \"%s\"",src,dst); - routing_component_full_t routing = (routing_component_full_t)current_routing; - char *route_name; - route_name = bprintf("%s#%s",src,dst); - xbt_assert2(xbt_dynar_length(link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst); - xbt_assert2(!xbt_dict_get_or_null(routing->parse_routes,route_name), - "The route between \"%s\" and \"%s\" already exist",src,dst); - xbt_dict_set(routing->parse_routes, route_name, route, NULL); - free(route_name); -} - -static void full_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) { - DEBUG4("Full - Load ASroute from \"%s(%s)\" to \"%s(%s)\"",src,e_route->src_gateway,dst,e_route->dst_gateway); - routing_component_full_t routing = (routing_component_full_t)current_routing; - char *route_name; - route_name = bprintf("%s#%s",src,dst); - xbt_assert2(xbt_dynar_length(link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst); - xbt_assert4(!xbt_dict_get_or_null(routing->parse_routes,route_name), - "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist", - src,e_route->src_gateway,dst,e_route->dst_gateway); - xbt_dict_set(routing->parse_routes, route_name, e_route, NULL); - free(route_name); -} - static route_extended_t full_get_route(routing_component_t rc, const char* src,const char* dst) { - + xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name); + + /* set utils vars */ routing_component_full_t routing = (routing_component_full_t)rc; + int table_size = xbt_dict_length(routing->to_index); - xbt_assert1(src && dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name); - - routing_component_t src_as, dst_as; - int *src_id,*dst_id; - - src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src); - dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst); - - xbt_assert0(src_as != NULL && dst_as != NULL, "Ask for route \"from\" or \"to\" no found"); - xbt_assert0(src_as == dst_as, "The src and dst are in differents AS"); - xbt_assert0(rc == dst_as, "The routing component of src and dst is not the same as the network elements belong"); + generic_src_dst_check(rc,src,dst); + int *src_id = xbt_dict_get_or_null(routing->to_index,src); + int *dst_id = xbt_dict_get_or_null(routing->to_index,dst); + xbt_assert2(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",src,dst); - src_id = xbt_dict_get(routing->to_index,src); - dst_id = xbt_dict_get(routing->to_index,dst); - - xbt_assert0(src_id && dst_id, "Ask for route \"from\" or \"to\" no found in the local table"); - + route_extended_t e_route = NULL; + route_extended_t new_e_route = NULL; void* link; unsigned int cpt=0; - route_extended_t e_route = TO_ROUTE_FULL(*src_id,*dst_id,routing); - route_extended_t new_e_route = xbt_new0(s_route_extended_t,1); - new_e_route->src_gateway = e_route->src_gateway; - new_e_route->dst_gateway = e_route->dst_gateway; - new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); - xbt_dynar_foreach(e_route->generic_route.link_list, cpt, link) { - xbt_dynar_push(new_e_route->generic_route.link_list,&link); + + e_route = TO_ROUTE_FULL(*src_id,*dst_id); + + if(e_route) { + new_e_route = xbt_new0(s_route_extended_t,1); + new_e_route->src_gateway = e_route->src_gateway; + new_e_route->dst_gateway = e_route->dst_gateway; + new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + xbt_dynar_foreach(e_route->generic_route.link_list, cpt, link) { + xbt_dynar_push(new_e_route->generic_route.link_list,&link); + } } return new_e_route; } static void full_finalize(routing_component_t rc) { routing_component_full_t routing = (routing_component_full_t)rc; + int table_size = xbt_dict_length(routing->to_index); int i,j; if (routing) { - int table_size = xbt_dict_length(routing->to_index); /* Delete routing table */ - for (i=0;igeneric_route.link_list)); - if(e_route->src_gateway) xbt_free(e_route->src_gateway); - if(e_route->dst_gateway) xbt_free(e_route->dst_gateway); - xbt_free(e_route); - } - } - } + for (i=0;irouting_table); + /* Delete bypass dict */ + xbt_dict_free(&routing->bypassRoutes); /* Delete index dict */ xbt_dict_free(&(routing->to_index)); /* Delete structure */ @@ -720,44 +674,45 @@ static void full_finalize(routing_component_t rc) { /* Creation routing model functions */ -static void* model_full_create() { +static void* model_full_create(void) { routing_component_full_t new_component = xbt_new0(s_routing_component_full_t,1); - new_component->generic_routing.set_processing_units = full_set_processing_units; - new_component->generic_routing.set_autonomous_system = full_set_autonomous_system; - new_component->generic_routing.set_route = full_set_route; - new_component->generic_routing.set_ASroute = full_set_ASroute; + new_component->generic_routing.set_processing_units = generic_set_processing_units; + new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; + new_component->generic_routing.set_route = generic_set_route; + new_component->generic_routing.set_ASroute = generic_set_ASroute; + new_component->generic_routing.set_bypassroute = generic_set_bypassroute; new_component->generic_routing.get_route = full_get_route; + new_component->generic_routing.get_bypass_route = generic_get_bypassroute; new_component->generic_routing.finalize = full_finalize; new_component->to_index = xbt_dict_new(); + new_component->bypassRoutes = xbt_dict_new(); new_component->parse_routes = xbt_dict_new(); - return new_component; + return new_component; } -static void model_full_load() { +static void model_full_load(void) { /* use "surfxml_add_callback" to add a parse function call */ } -static void model_full_unload() { +static void model_full_unload(void) { /* use "surfxml_del_callback" to remove a parse function call */ } -static void model_full_end() { - - char *key, *src_name, *dst_name, *link_name;//, *src_gw_name, *dst_gw_name; +static void model_full_end(void) { + + char *key, *end; const char* sep = "#"; - int *src_id, *dst_id; - unsigned int i, j, cpt; - - route_extended_t e_route, new_e_route; + int src_id, dst_id; + unsigned int i, j; route_t route; + route_extended_t e_route; void* data; - xbt_dynar_t links, links_id; xbt_dict_cursor_t cursor = NULL; xbt_dynar_t keys = NULL; - - routing_component_full_t routing = ((routing_component_full_t)current_routing); + /* set utils vars */ + routing_component_full_t routing = ((routing_component_full_t)current_routing); int table_size = xbt_dict_length(routing->to_index); /* Create the routing table */ @@ -765,54 +720,10 @@ static void model_full_end() { /* Put the routes in position */ xbt_dict_foreach(routing->parse_routes, cursor, key, data) { - keys = xbt_str_split_str(key, sep); - - src_name = xbt_dynar_get_as(keys, 0, char*); - dst_name = xbt_dynar_get_as(keys, 1, char*); - - src_id = xbt_dict_get_or_null(routing->to_index, src_name); - dst_id = xbt_dict_get_or_null(routing->to_index, dst_name); - - if (src_id == NULL || dst_id == NULL ) - THROW2(mismatch_error,0,"Network elements %s or %s not found", src_name, dst_name); - - new_e_route = xbt_new0(s_route_extended_t,1); - new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); - new_e_route->src_gateway = NULL; - new_e_route->dst_gateway = NULL; - TO_ROUTE_FULL(*src_id,*dst_id,current_routing) = new_e_route; - - xbt_assert0(routing->generic_routing.hierarchy == SURF_ROUTING_BASE || routing->generic_routing.hierarchy == SURF_ROUTING_RECURSIVE, - "the hierarchy type is not defined"); - - if(routing->generic_routing.hierarchy == SURF_ROUTING_BASE ) { - - route = (route_t)data; - links = route->link_list; - - } else if(routing->generic_routing.hierarchy == SURF_ROUTING_RECURSIVE ) { - - e_route = (route_extended_t)data; - // FIXME: HERE CHECK THE GATEWAY!!!!!!!!! - links = e_route->generic_route.link_list; - /* remeber not erase the gateway names */ - TO_ROUTE_FULL(*src_id,*dst_id,current_routing)->src_gateway = e_route->src_gateway; - TO_ROUTE_FULL(*src_id,*dst_id,current_routing)->dst_gateway = e_route->dst_gateway; - - } - - links_id = TO_ROUTE_FULL(*src_id,*dst_id,current_routing)->generic_route.link_list; - - xbt_dynar_foreach(links, cpt, link_name) { - - void* link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); - if (link) - xbt_dynar_push(links_id,&link); - else - THROW1(mismatch_error,0,"Link %s not found", link_name); - } - + src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10); + dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10); + TO_ROUTE_FULL(src_id,dst_id) = generic_new_extended_route(current_routing->hierarchy,data,1); xbt_dynar_free(&keys); } @@ -827,23 +738,25 @@ static void model_full_end() { xbt_dict_free(&(routing->parse_routes)); /* Add the loopback if needed */ - for (i = 0; i < table_size; i++) { - e_route = TO_ROUTE_FULL(i, i,current_routing); - if(!e_route) { // && !xbt_dynar_length(e_route->generic_route.link_list) - e_route = xbt_new0(s_route_extended_t,1); - e_route->src_gateway = NULL; - e_route->dst_gateway = NULL; - e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); - xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback); - TO_ROUTE_FULL(i, i,current_routing) = e_route; + if(current_routing->hierarchy == SURF_ROUTING_BASE) { + for (i = 0; i < table_size; i++) { + e_route = TO_ROUTE_FULL(i, i); + if(!e_route) { + e_route = xbt_new0(s_route_extended_t,1); + e_route->src_gateway = NULL; + e_route->dst_gateway = NULL; + e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback); + TO_ROUTE_FULL(i, i) = e_route; + } } } /* Shrink the dynar routes (save unused slots) */ for (i=0;igeneric_route.link_list,0); + if(TO_ROUTE_FULL(i,j)) + xbt_dynar_shrink(TO_ROUTE_FULL(i,j)->generic_route.link_list,0); } /* ************************************************************************** */ @@ -852,52 +765,219 @@ static void model_full_end() { #define TO_FLOYD_COST(i,j) cost_table[(i)+(j)*table_size] #define TO_FLOYD_PRED(i,j) (routing->predecessor_table)[(i)+(j)*table_size] #define TO_FLOYD_LINK(i,j) (routing->link_table)[(i)+(j)*table_size] -#define TO_FLOYD_AS(i,j) (routing->AS_table)[(i)+(j)*AS_table_size] /* Routing model structure */ typedef struct { s_routing_component_t generic_routing; - route_extended_t last_route; /* vars for calculate the floyd algorith. */ int *predecessor_table; - void** link_table; /* char* -> network_element_t* */ - xbt_dict_t predecessor_to_index; - /* store information to solve any AS route */ - xbt_dict_t AS_to_index; /* char* -> network_element_t* */ - route_limits_t AS_table; + route_extended_t *link_table; /* char* -> int* */ + xbt_dict_t to_index; + xbt_dict_t bypassRoutes; /* store data during the parse process */ xbt_dict_t parse_routes; - } s_routing_component_floyd_t,*routing_component_floyd_t; /* Business methods */ static route_extended_t floyd_get_route(routing_component_t rc, const char* src,const char* dst) { - - return NULL; -} - -static xbt_dict_t floyd_get_network_elements(routing_component_t rc, e_surf_network_element_type_t req_type) -{ - return NULL; + xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name); + + /* set utils vars */ + routing_component_floyd_t routing = (routing_component_floyd_t) rc; + int table_size = xbt_dict_length(routing->to_index); + + generic_src_dst_check(rc,src,dst); + int *src_id = xbt_dict_get_or_null(routing->to_index,src); + int *dst_id = xbt_dict_get_or_null(routing->to_index,dst); + xbt_assert2(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",src,dst); + + /* create a result route */ + route_extended_t new_e_route = xbt_new0(s_route_extended_t,1); + new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + new_e_route->src_gateway = NULL; + new_e_route->dst_gateway = NULL; + + int first = 1; + int pred = *dst_id; + int prev_pred = 0; + char *gw_src,*gw_dst, *prev_gw_src,*prev_gw_dst, *first_gw; + unsigned int cpt; + void* link; + xbt_dynar_t links; + + do { + prev_pred = pred; + pred = TO_FLOYD_PRED(*src_id, pred); + if(pred == -1) /* if no pred in route -> no route to host */ + break; + xbt_assert2(TO_FLOYD_LINK(pred,prev_pred),"Invalid link for the route between \"%s\" or \"%s\"", src, dst); + + prev_gw_src = gw_src; + prev_gw_dst = gw_dst; + + route_extended_t e_route = TO_FLOYD_LINK(pred,prev_pred); + gw_src = e_route->src_gateway; + gw_dst = e_route->dst_gateway; + + if(first) first_gw = gw_dst; + + if(rc->hierarchy == SURF_ROUTING_RECURSIVE && !first && strcmp(gw_dst,prev_gw_src)) { + xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route))(gw_dst,prev_gw_src); + xbt_assert2(e_route_as_to_as,"no route between \"%s\" and \"%s\"",gw_dst,prev_gw_src); + links = e_route_as_to_as; + int pos = 0; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_insert_at(new_e_route->generic_route.link_list,pos,&link); + pos++; + } + } + + links = e_route->generic_route.link_list; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_unshift(new_e_route->generic_route.link_list,&link); + } + first=0; + + } while(pred != *src_id); + xbt_assert4(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", *src_id, *dst_id,src,dst); + + if(rc->hierarchy == SURF_ROUTING_RECURSIVE) { + new_e_route->src_gateway = gw_src; + new_e_route->dst_gateway = first_gw; + } + + return new_e_route; } static void floyd_finalize(routing_component_t rc) { - + routing_component_floyd_t routing = (routing_component_floyd_t)rc; + int i,j,table_size; + if (routing) { + table_size = xbt_dict_length(routing->to_index); + /* Delete link_table */ + for (i=0;ilink_table); + /* Delete bypass dict */ + xbt_dict_free(&routing->bypassRoutes); + /* Delete index dict */ + xbt_dict_free(&(routing->to_index)); + /* Delete dictionary index dict, predecessor and links table */ + xbt_free(routing->predecessor_table); + /* Delete structure */ + xbt_free(rc); + } } static void* model_floyd_create(void) { -return NULL; + routing_component_floyd_t new_component = xbt_new0(s_routing_component_floyd_t,1); + new_component->generic_routing.set_processing_units = generic_set_processing_units; + new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; + new_component->generic_routing.set_route = generic_set_route; + new_component->generic_routing.set_ASroute = generic_set_ASroute; + new_component->generic_routing.set_bypassroute = generic_set_bypassroute; + new_component->generic_routing.get_route = floyd_get_route; + new_component->generic_routing.get_bypass_route = generic_get_bypassroute; + new_component->generic_routing.finalize = floyd_finalize; + new_component->to_index = xbt_dict_new(); + new_component->bypassRoutes = xbt_dict_new(); + new_component->parse_routes = xbt_dict_new(); + return new_component; } -static void model_floyd_load() { +static void model_floyd_load(void) { + /* use "surfxml_add_callback" to add a parse function call */ } -static void model_floyd_unload() { +static void model_floyd_unload(void) { + /* use "surfxml_del_callback" to remove a parse function call */ } -static void model_floyd_end() { +static void model_floyd_end(void) { + + routing_component_floyd_t routing = ((routing_component_floyd_t)current_routing); + xbt_dict_cursor_t cursor = NULL; + double * cost_table; + char *key,*data, *end; + const char *sep = "#"; + xbt_dynar_t keys; + int src_id, dst_id; + unsigned int i,j,a,b,c; + + /* set the size of inicial table */ + int table_size = xbt_dict_length(routing->to_index); + + /* Create Cost, Predecessor and Link tables */ + cost_table = xbt_new0(double, table_size*table_size); /* link cost from host to host */ + routing->predecessor_table = xbt_new0(int, table_size*table_size); /* predecessor host numbers */ + routing->link_table = xbt_new0(route_extended_t, table_size*table_size); /* actual link between src and dst */ + + /* Initialize costs and predecessors*/ + for(i = 0; iparse_routes, cursor, key, data) { + keys = xbt_str_split_str(key, sep); + src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10); + dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10); + TO_FLOYD_LINK(src_id,dst_id) = generic_new_extended_route(current_routing->hierarchy,data,0); + TO_FLOYD_PRED(src_id,dst_id) = src_id; + /* set link cost */ + TO_FLOYD_COST(src_id,dst_id) = ((TO_FLOYD_LINK(src_id,dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */ + xbt_dynar_free(&keys); + } + + /* Add the loopback if needed */ + if(current_routing->hierarchy == SURF_ROUTING_BASE) { + for (i = 0; i < table_size; i++) { + route_extended_t e_route = TO_FLOYD_LINK(i, i); + if(!e_route) { + e_route = xbt_new0(s_route_extended_t,1); + e_route->src_gateway = NULL; + e_route->dst_gateway = NULL; + e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback); + TO_FLOYD_LINK(i,i) = e_route; + TO_FLOYD_PRED(i,i) = i; + TO_FLOYD_COST(i,i) = 1; + } + } + } + /* Calculate path costs */ + for(c=0;cparse_routes, cursor, key, data) { + route_t route = (route_t)data; + xbt_dynar_free(&(route->link_list)); + xbt_free(data); + } + + /* delete parse dict */ + xbt_dict_free(&(routing->parse_routes)); + + /* cleanup */ + xbt_free(cost_table); } /* ************************************************************************** */ @@ -905,47 +985,434 @@ static void model_floyd_end() { typedef struct { s_routing_component_t generic_routing; - xbt_graph_t route_graph; - xbt_dict_t graph_node_map; - xbt_dict_t route_cache; - xbt_dynar_t last_route; + xbt_dict_t to_index; + xbt_dict_t bypassRoutes; + xbt_graph_t route_graph; /* xbt_graph */ + xbt_dict_t graph_node_map; /* map */ + xbt_dict_t route_cache; /* use in cache mode */ int cached; + xbt_dict_t parse_routes; } s_routing_component_dijkstra_t,*routing_component_dijkstra_t; -/* Parse routing model functions */ -/* Business methods */ +typedef struct graph_node_data { + int id; + int graph_id; /* used for caching internal graph id's */ +} s_graph_node_data_t, * graph_node_data_t; -/* Creation routing model functions */ +typedef struct graph_node_map_element { + xbt_node_t node; +} s_graph_node_map_element_t, * graph_node_map_element_t; -static void* model_dijkstra_create() { - return NULL; -} +typedef struct route_cache_element { + int * pred_arr; + int size; +} s_route_cache_element_t, * route_cache_element_t; -static void model_dijkstra_load() { -} +/* Free functions */ -static void model_dijkstra_unload() { +static void route_cache_elem_free(void *e) { + route_cache_element_t elm=(route_cache_element_t)e; + if (elm) { + xbt_free(elm->pred_arr); + xbt_free(elm); + } } -static void model_dijkstra_end() { +static void graph_node_map_elem_free(void *e) { + graph_node_map_element_t elm = (graph_node_map_element_t)e; + if(elm) { + xbt_free(elm); + } } -static void* model_dijkstracache_create() { - return NULL; +static void graph_edge_data_free(void *e) { + route_extended_t e_route = (route_extended_t)e; + if(e_route) { + xbt_dynar_free(&(e_route->generic_route.link_list)); + if(e_route->src_gateway) xbt_free(e_route->src_gateway); + if(e_route->dst_gateway) xbt_free(e_route->dst_gateway); + xbt_free(e_route); + } } -static void model_dijkstracache_load() { -} +/* Utility functions */ -static void model_dijkstracache_unload() { -} +static xbt_node_t route_graph_new_node(routing_component_dijkstra_t rc, int id, int graph_id) { + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; + xbt_node_t node = NULL; + graph_node_data_t data = NULL; + graph_node_map_element_t elm = NULL; -static void model_dijkstracache_end() { -} + data = xbt_new0(struct graph_node_data, 1); + data->id = id; + data->graph_id = graph_id; + node = xbt_graph_new_node(routing->route_graph, data); + elm = xbt_new0(struct graph_node_map_element, 1); + elm->node = node; + xbt_dict_set_ext(routing->graph_node_map, (char*)(&id), sizeof(int), (xbt_set_elm_t)elm, &graph_node_map_elem_free); -/* ************************************************************************** */ + return node; +} + +static graph_node_map_element_t graph_node_map_search(routing_component_dijkstra_t rc, int id) { + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; + graph_node_map_element_t elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&id), sizeof(int)); + return elm; +} + +/* Parsing */ + +static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, int dst_id, route_extended_t e_route ) { + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; + + xbt_node_t src = NULL; + xbt_node_t dst = NULL; + graph_node_map_element_t src_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&src_id), sizeof(int)); + graph_node_map_element_t dst_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&dst_id), sizeof(int)); + + if(src_elm) + src = src_elm->node; + + if(dst_elm) + dst = dst_elm->node; + + /* add nodes if they don't exist in the graph */ + if(src_id == dst_id && src == NULL && dst == NULL) { + src = route_graph_new_node(rc,src_id, -1); + dst = src; + } else { + if(src == NULL) { + src = route_graph_new_node(rc,src_id, -1); + } + if(dst == NULL) { + dst = route_graph_new_node(rc,dst_id, -1); + } + } + + /* add link as edge to graph */ + xbt_graph_new_edge(routing->route_graph, src, dst, e_route); +} + +static void add_loopback_dijkstra(routing_component_dijkstra_t rc) { + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; + + xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph); + + xbt_node_t node = NULL; + unsigned int cursor2; + xbt_dynar_foreach(nodes, cursor2, node) { + xbt_dynar_t out_edges = xbt_graph_node_get_outedges(node); + xbt_edge_t edge = NULL; + unsigned int cursor; + + int found = 0; + xbt_dynar_foreach(out_edges, cursor, edge) { + xbt_node_t other_node = xbt_graph_edge_get_target(edge); + if(other_node == node) { + found = 1; + break; + } + } + + if(!found) { + route_extended_t e_route = xbt_new0(s_route_extended_t,1); + e_route->src_gateway = NULL; + e_route->dst_gateway = NULL; + e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + xbt_dynar_push(e_route->generic_route.link_list,&global_routing->loopback); + xbt_graph_new_edge(routing->route_graph, node, node, e_route); + } + } +} + +/* Business methods */ + +static route_extended_t dijkstra_get_route(routing_component_t rc, const char* src,const char* dst) { + xbt_assert1(rc&&src&&dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name); + + /* set utils vars */ + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; + + generic_src_dst_check(rc,src,dst); + int *src_id = xbt_dict_get_or_null(routing->to_index,src); + int *dst_id = xbt_dict_get_or_null(routing->to_index,dst); + xbt_assert2(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",src,dst); + + /* create a result route */ + route_extended_t new_e_route = xbt_new0(s_route_extended_t,1); + new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + new_e_route->src_gateway = NULL; + new_e_route->dst_gateway = NULL; + + int *pred_arr = NULL; + int src_node_id = 0; + int dst_node_id = 0; + int * nodeid = NULL; + int v; + route_extended_t e_route; + int size = 0; + unsigned int cpt; + void* link; + xbt_dynar_t links = NULL; + route_cache_element_t elm = NULL; + xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph); + + /* Use the graph_node id mapping set to quickly find the nodes */ + graph_node_map_element_t src_elm = graph_node_map_search(routing,*src_id); + graph_node_map_element_t dst_elm = graph_node_map_search(routing,*dst_id); + xbt_assert2(src_elm != NULL && dst_elm != NULL, "src %d or dst %d does not exist", *src_id, *dst_id); + src_node_id = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id; + dst_node_id = ((graph_node_data_t)xbt_graph_node_get_data(dst_elm->node))->graph_id; + + /* if the src and dst are the same */ /* fixed, missing in the previous version */ + if( src_node_id == dst_node_id ) { + + xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t); + xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t); + xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_s_v, node_e_v); + + xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id, *dst_id); + + e_route = (route_extended_t)xbt_graph_edge_get_data(edge); + + links = e_route->generic_route.link_list; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_unshift(new_e_route->generic_route.link_list,&link); + } + + return new_e_route; + } + + if(routing->cached) { + /*check if there is a cached predecessor list avail */ + elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routing->route_cache, (char*)(&src_id), sizeof(int)); + } + + if(elm) { /* cached mode and cache hit */ + pred_arr = elm->pred_arr; + } else { /* not cached mode or cache miss */ + double * cost_arr = NULL; + xbt_heap_t pqueue = NULL; + int i = 0; + + int nr_nodes = xbt_dynar_length(nodes); + cost_arr = xbt_new0(double, nr_nodes); /* link cost from src to other hosts */ + pred_arr = xbt_new0(int, nr_nodes); /* predecessors in path from src */ + pqueue = xbt_heap_new(nr_nodes, xbt_free); + + /* initialize */ + cost_arr[src_node_id] = 0.0; + + for(i = 0; i < nr_nodes; i++) { + if(i != src_node_id) { + cost_arr[i] = DBL_MAX; + } + + pred_arr[i] = 0; + + /* initialize priority queue */ + nodeid = xbt_new0(int, 1); + *nodeid = i; + xbt_heap_push(pqueue, nodeid, cost_arr[i]); + + } + + /* apply dijkstra using the indexes from the graph's node array */ + while(xbt_heap_size(pqueue) > 0) { + int * v_id = xbt_heap_pop(pqueue); + xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t); + xbt_dynar_t out_edges = xbt_graph_node_get_outedges(v_node); + xbt_edge_t edge = NULL; + unsigned int cursor; + + xbt_dynar_foreach(out_edges, cursor, edge) { + xbt_node_t u_node = xbt_graph_edge_get_target(edge); + graph_node_data_t data = xbt_graph_node_get_data(u_node); + int u_id = data->graph_id; + route_extended_t tmp_e_route = (route_extended_t)xbt_graph_edge_get_data(edge); + int cost_v_u = (tmp_e_route->generic_route.link_list)->used; /* count of links, old model assume 1 */ + + if(cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) { + pred_arr[u_id] = *v_id; + cost_arr[u_id] = cost_v_u + cost_arr[*v_id]; + nodeid = xbt_new0(int, 1); + *nodeid = u_id; + xbt_heap_push(pqueue, nodeid, cost_arr[u_id]); + } + } + + /* free item popped from pqueue */ + xbt_free(v_id); + } + + xbt_free(cost_arr); + xbt_heap_free(pqueue); + } + + /* compose route path with links */ + char *gw_src,*gw_dst, *prev_gw_src,*prev_gw_dst, *first_gw; + + for(v = dst_node_id; v != src_node_id; v = pred_arr[v]) { + xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t); + xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t); + xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v); + + xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id, *dst_id); + + prev_gw_src = gw_src; + prev_gw_dst = gw_dst; + + e_route = (route_extended_t)xbt_graph_edge_get_data(edge); + gw_src = e_route->src_gateway; + gw_dst = e_route->dst_gateway; + + if(v==dst_node_id) first_gw = gw_dst; + + if(rc->hierarchy == SURF_ROUTING_RECURSIVE && v!=dst_node_id && strcmp(gw_dst,prev_gw_src)) { + xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route))(gw_dst,prev_gw_src); + xbt_assert2(e_route_as_to_as,"no route between \"%s\" and \"%s\"",gw_dst,prev_gw_src); + links = e_route_as_to_as; + int pos = 0; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_insert_at(new_e_route->generic_route.link_list,pos,&link); + pos++; + } + } + + links = e_route->generic_route.link_list; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_unshift(new_e_route->generic_route.link_list,&link); + } + size++; + } + + if(rc->hierarchy == SURF_ROUTING_RECURSIVE) { + new_e_route->src_gateway = gw_src; + new_e_route->dst_gateway = first_gw; + } + + if(routing->cached && elm == NULL) { + /* add to predecessor list of the current src-host to cache */ + elm = xbt_new0(struct route_cache_element, 1); + elm->pred_arr = pred_arr; + elm->size = size; + xbt_dict_set_ext(routing->route_cache, (char*)(&src_id), sizeof(int), (xbt_set_elm_t)elm, &route_cache_elem_free); + } + + if(!routing->cached) + xbt_free(pred_arr); + + return new_e_route; +} + +static void dijkstra_finalize(routing_component_t rc) { + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; + + if (routing) { + xbt_graph_free_graph(routing->route_graph, &xbt_free, &graph_edge_data_free, &xbt_free); + xbt_dict_free(&routing->graph_node_map); + if(routing->cached) + xbt_dict_free(&routing->route_cache); + /* Delete bypass dict */ + xbt_dict_free(&routing->bypassRoutes); + /* Delete index dict */ + xbt_dict_free(&(routing->to_index)); + /* Delete structure */ + xbt_free(routing); + } +} + +/* Creation routing model functions */ + +static void* model_dijkstra_both_create(int cached) { + routing_component_dijkstra_t new_component = xbt_new0(s_routing_component_dijkstra_t,1); + new_component->generic_routing.set_processing_units = generic_set_processing_units; + new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; + new_component->generic_routing.set_route = generic_set_route; + new_component->generic_routing.set_ASroute = generic_set_ASroute; + new_component->generic_routing.set_bypassroute = generic_set_bypassroute; + new_component->generic_routing.get_route = dijkstra_get_route; + new_component->generic_routing.get_bypass_route = generic_get_bypassroute; + new_component->generic_routing.finalize = dijkstra_finalize; + new_component->cached = cached; + new_component->to_index = xbt_dict_new(); + new_component->bypassRoutes = xbt_dict_new(); + new_component->parse_routes = xbt_dict_new(); + return new_component; +} + +static void* model_dijkstra_create(void) { + return model_dijkstra_both_create(0); +} + +static void* model_dijkstracache_create(void) { + return model_dijkstra_both_create(1); +} + +static void model_dijkstra_both_load(void) { + /* use "surfxml_add_callback" to add a parse function call */ +} + +static void model_dijkstra_both_unload(void) { + /* use "surfxml_del_callback" to remove a parse function call */ +} + +static void model_dijkstra_both_end(void) { + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) current_routing; + xbt_dict_cursor_t cursor = NULL; + char *key, *data, *end; + const char *sep = "#"; + xbt_dynar_t keys; + xbt_node_t node = NULL; + unsigned int cursor2; + xbt_dynar_t nodes = NULL; + int src_id, dst_id; + route_t route; + + /* Create the topology graph */ + routing->route_graph = xbt_graph_new_graph(1, NULL); + routing->graph_node_map = xbt_dict_new(); + + if(routing->cached) + routing->route_cache = xbt_dict_new(); + + /* Put the routes in position */ + xbt_dict_foreach(routing->parse_routes, cursor, key, data) { + keys = xbt_str_split_str(key, sep); + src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10); + dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10); + route_extended_t e_route = generic_new_extended_route(current_routing->hierarchy,data,0); + route_new_dijkstra(routing,src_id,dst_id,e_route); + xbt_dynar_free(&keys); + } + + /* delete the parse table */ + xbt_dict_foreach(routing->parse_routes, cursor, key, data) { + route = (route_t)data; + xbt_dynar_free(&(route->link_list)); + xbt_free(data); + } + + /* delete parse dict */ + xbt_dict_free(&(routing->parse_routes)); + + /* Add the loopback if needed */ + if(current_routing->hierarchy == SURF_ROUTING_BASE) + add_loopback_dijkstra(routing); + + /* initialize graph indexes in nodes after graph has been built */ + nodes = xbt_graph_get_nodes(routing->route_graph); + + xbt_dynar_foreach(nodes, cursor2, node) { + graph_node_data_t data = xbt_graph_node_get_data(node); + data->graph_id = cursor2; + } + +} + +/* ************************************************************************** */ /* ******************************* NO ROUTING ******************************* */ /* Routing model structure */ @@ -957,21 +1424,33 @@ typedef struct { static route_extended_t none_get_route(routing_component_t rc, const char* src,const char* dst){ return NULL; } +static route_extended_t none_get_bypass_route(routing_component_t rc, const char* src,const char* dst){ + return NULL; +} static void none_finalize(routing_component_t rc) { xbt_free(rc); } +static void none_set_processing_units(routing_component_t rc, const char* name) {} +static void none_set_autonomous_system(routing_component_t rc, const char* name) {} + /* Creation routing model functions */ -static void* model_none_create() { +static void* model_none_create(void) { routing_component_none_t new_component = xbt_new0(s_routing_component_none_t,1); + new_component->generic_routing.set_processing_units = none_set_processing_units; + new_component->generic_routing.set_autonomous_system = none_set_autonomous_system; + new_component->generic_routing.set_route = NULL; + new_component->generic_routing.set_ASroute = NULL; + new_component->generic_routing.set_bypassroute = NULL; new_component->generic_routing.get_route = none_get_route; + new_component->generic_routing.get_bypass_route = none_get_bypass_route; new_component->generic_routing.finalize = none_finalize; return new_component; } -static void model_none_load() {} -static void model_none_unload() {} -static void model_none_end() {} +static void model_none_load(void) {} +static void model_none_unload(void) {} +static void model_none_end(void) {} /* ************************************************** */ /* ********** PATERN FOR NEW ROUTING **************** */ @@ -980,1190 +1459,418 @@ static void model_none_end() {} * also you need to set at the start of the file, the new model in the model * list. Remember keep the null ending of the list. */ -/* Routing model structure */ +/*** Routing model structure ***/ typedef struct { s_routing_component_t generic_routing; /* things that your routing model need */ } s_routing_component_NEW_t,*routing_component_NEW_t; -/* Parse routing model functions */ -static void NEW_parse_S_host(void) {} /* example*/ +/*** Parse routing model functions ***/ +static void model_NEW_set_processing_units(routing_component_t rc, const char* name) {} +static void model_NEW_set_autonomous_system(routing_component_t rc, const char* name) {} +static void model_NEW_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) {} +static void model_NEW_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t route) {} +static void model_NEW_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) {} -/* Business methods */ -static route_extended_t NEW_get_route(routing_component_t rc, const char* src,const char* dst) {return NULL;} /* mandatory */ -static void NEW_finalize(routing_component_t rc) {} /* mandatory */ - -/* Creation routing model functions */ -static void* model_NEW_create() {return NULL;} /* mandatory */ -static void model_NEW_load() {} /* mandatory */ -static void model_NEW_unload() {} /* mandatory */ -static void model_NEW_end() {} /* mandatory */ +/*** Business methods ***/ +static route_extended_t NEW_get_route(routing_component_t rc, const char* src,const char* dst) {return NULL;} +static route_extended_t NEW_get_bypass_route(routing_component_t rc, const char* src,const char* dst) {return NULL;} +static void NEW_finalize(routing_component_t rc) {} +/*** Creation routing model functions ***/ +static void* model_NEW_create(void) { + routing_component_full_t new_component = xbt_new0(s_routing_component_full_t,1); + new_component->generic_routing.set_processing_units = model_NEW_set_processing_units; + new_component->generic_routing.set_autonomous_system = model_NEW_set_autonomous_system; + new_component->generic_routing.set_route = model_NEW_set_route; + new_component->generic_routing.set_ASroute = model_NEW_set_ASroute; + new_component->generic_routing.set_bypassroute = model_NEW_set_bypassroute; + new_component->generic_routing.get_route = NEW_get_route; + new_component->generic_routing.get_bypass_route = NEW_get_bypass_route; + new_component->generic_routing.finalize = NEW_finalize; + /* initialization of internal structures */ + return new_component; +} /* mandatory */ +static void model_NEW_load(void) {} /* mandatory */ +static void model_NEW_unload(void) {} /* mandatory */ +static void model_NEW_end(void) {} /* mandatory */ -//////////////////////////////////////////////////////////////////////////////// -// HERE FINISH THE NEW CODE -//////////////////////////////////////////////////////////////////////////////// +/* ************************************************************************** */ +/* ************************* GENERIC PARSE FUNCTIONS ************************ */ + +static void generic_set_processing_units(routing_component_t rc, const char* name) { + DEBUG1("Load process unit \"%s\"",name); + model_type_t modeltype = rc->routing; + int *id = xbt_new0(int,1); + xbt_dict_t _to_index; + if(modeltype==&routing_models[SURF_MODEL_FULL]) + _to_index = ((routing_component_full_t)rc)->to_index; + + else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) + _to_index = ((routing_component_floyd_t)rc)->to_index; + + else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]|| + modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) + _to_index = ((routing_component_dijkstra_t)rc)->to_index; + + else xbt_die("\"generic_set_processing_units\" not support"); + *id = xbt_dict_length(_to_index); + xbt_dict_set(_to_index,name,id,xbt_free); +} -//...... DEBUG ONLY .... // -static void print_tree(routing_component_t rc) { - printf("(%s %s)\n",rc->name,rc->routing->name); - printf(" "); - xbt_dict_cursor_t cursor = NULL; - char *key; - int *val; - if( rc->routing == &(routing_models[SURF_MODEL_FULL]) ) - { xbt_dict_foreach(((routing_component_full_t)rc)->to_index, cursor, key, val) { printf("<%s-%d> ",key,*val); } } - else if( rc->routing == &(routing_models[SURF_MODEL_FLOYD]) ) - { xbt_dict_foreach(((routing_component_floyd_t)rc)->predecessor_to_index, cursor, key, val) { printf("<%s-%d> ",key,*val); } - xbt_dict_foreach(((routing_component_floyd_t)rc)->AS_to_index, cursor, key, val) { printf("<%s-%d> ",key,*val); } } - else - xbt_assert0(0, "Invalid model for call \"print_tree\""); - printf("\n"); - routing_component_t elem; - xbt_dict_foreach(rc->routing_sons, cursor, key, elem) { - printf("<--\n"); - print_tree(elem); - printf("-->\n"); - } +static void generic_set_autonomous_system(routing_component_t rc, const char* name) { + DEBUG1("Load Autonomous system \"%s\"",name); + model_type_t modeltype = rc->routing; + int *id = xbt_new0(int,1); + xbt_dict_t _to_index; + if(modeltype==&routing_models[SURF_MODEL_FULL]) + _to_index = ((routing_component_full_t)rc)->to_index; + + else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) + _to_index = ((routing_component_floyd_t)rc)->to_index; + + else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]|| + modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) + _to_index = ((routing_component_dijkstra_t)rc)->to_index; + + else xbt_die("\"generic_set_autonomous_system\" not support"); + *id = xbt_dict_length(_to_index); + xbt_dict_set(_to_index,name,id,xbt_free); } -//...... DEBUG ONLY .... // -static void print_global() { - xbt_dict_cursor_t cursor = NULL; - char *key; - routing_component_t elem; - xbt_dict_foreach(global_routing->where_network_elements, cursor, key, elem) { - printf("<%s>\n",key); - } +static void generic_set_route(routing_component_t rc, const char* src, const char* dst, route_t route) { + DEBUG2("Load Route from \"%s\" to \"%s\"",src,dst); + model_type_t modeltype = rc->routing; + xbt_dict_t _parse_routes; + xbt_dict_t _to_index; + char *route_name; + int *src_id, *dst_id; + + if(modeltype==&routing_models[SURF_MODEL_FULL]) { + _parse_routes = ((routing_component_full_t)rc)->parse_routes; + _to_index = ((routing_component_full_t)rc)->to_index; + + } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) { + _parse_routes = ((routing_component_floyd_t)rc)->parse_routes; + _to_index = ((routing_component_floyd_t)rc)->to_index; + + } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]|| + modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) { + _parse_routes = ((routing_component_dijkstra_t)rc)->parse_routes; + _to_index = ((routing_component_dijkstra_t)rc)->to_index; + + } else xbt_die("\"generic_set_route\" not support"); + + src_id = xbt_dict_get_or_null(_to_index, src); + dst_id = xbt_dict_get_or_null(_to_index, dst); + + xbt_assert2(src_id&&dst_id,"Network elements %s or %s not found", src, dst); + route_name = bprintf("%d#%d",*src_id,*dst_id); + + xbt_assert2(xbt_dynar_length(route->link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst); + xbt_assert2(!xbt_dict_get_or_null(_parse_routes,route_name), + "The route between \"%s\" and \"%s\" already exist",src,dst); + + xbt_dict_set(_parse_routes, route_name, route, NULL); + xbt_free(route_name); } -//...... DEBUG ONLY .... // -static void print_AS_start(void) { printf("AS!!! %s y se rutea \"%s\"\n",A_surfxml_AS_id,A_surfxml_AS_routing); } -static void print_AS_end(void) { printf("AS!!! %s\n",A_surfxml_AS_id); } -static void print_host(void) { printf("host!!! %s\n",A_surfxml_host_id); } -static void print_link(void) { printf("link!!! %s\n",A_surfxml_link_id); } -static void print_route(void) { printf("route!!! %s a %s\n",A_surfxml_route_src,A_surfxml_route_dst); } -static void print_ctn(void) { printf("ctn!!! %s\n",A_surfxml_link_c_ctn_id); } +static void generic_set_ASroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) { + DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",src,e_route->src_gateway,dst,e_route->dst_gateway); + model_type_t modeltype = rc->routing; + xbt_dict_t _parse_routes; + xbt_dict_t _to_index; + char *route_name; + int *src_id, *dst_id; + + if(modeltype==&routing_models[SURF_MODEL_FULL]) { + _parse_routes = ((routing_component_full_t)rc)->parse_routes; + _to_index = ((routing_component_full_t)rc)->to_index; + + } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) { + _parse_routes = ((routing_component_floyd_t)rc)->parse_routes; + _to_index = ((routing_component_floyd_t)rc)->to_index; + + } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]|| + modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) { + _parse_routes = ((routing_component_dijkstra_t)rc)->parse_routes; + _to_index = ((routing_component_dijkstra_t)rc)->to_index; + + } else xbt_die("\"generic_set_route\" not support"); + + src_id = xbt_dict_get_or_null(_to_index, src); + dst_id = xbt_dict_get_or_null(_to_index, dst); + + xbt_assert2(src_id&&dst_id,"Network elements %s or %s not found", src, dst); + route_name = bprintf("%d#%d",*src_id,*dst_id); + + xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst); + xbt_assert4(!xbt_dict_get_or_null(_parse_routes,route_name), + "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",src,e_route->src_gateway,dst,e_route->dst_gateway); + + xbt_dict_set(_parse_routes, route_name, e_route, NULL); + xbt_free(route_name); +} -//...... DEBUG ONLY .... // -static void DEBUG_exit(void) { +static void generic_set_bypassroute(routing_component_t rc, const char* src, const char* dst, route_extended_t e_route) { + DEBUG2("Load bypassRoute from \"%s\" to \"%s\"",src,dst); + model_type_t modeltype = rc->routing; + xbt_dict_t dict_bypassRoutes; + char *route_name; + if(modeltype==&routing_models[SURF_MODEL_FULL]) { + dict_bypassRoutes = ((routing_component_full_t)rc)->bypassRoutes; + } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) { + dict_bypassRoutes = ((routing_component_floyd_t)rc)->bypassRoutes; + } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]|| + modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) { + dict_bypassRoutes = ((routing_component_dijkstra_t)rc)->bypassRoutes; + } else xbt_die("\"generic_set_bypassroute\" not support"); + route_name = bprintf("%s#%s",src,dst); + xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst); + xbt_assert4(!xbt_dict_get_or_null(dict_bypassRoutes,route_name), + "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",src,e_route->src_gateway,dst,e_route->dst_gateway); + + route_extended_t new_e_route = generic_new_extended_route(SURF_ROUTING_RECURSIVE,e_route,0); + xbt_dynar_free( &(e_route->generic_route.link_list) ); + xbt_free(e_route); + xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, (void(*)(void*))generic_free_extended_route ); + xbt_free(route_name); +} + +/* ************************************************************************** */ +/* *********************** GENERIC BUSINESS METHODS ************************* */ + +static route_extended_t generic_get_bypassroute(routing_component_t rc, const char* src, const char* dst) { + model_type_t modeltype = rc->routing; + xbt_dict_t dict_bypassRoutes; + if(modeltype==&routing_models[SURF_MODEL_FULL]) { + dict_bypassRoutes = ((routing_component_full_t)rc)->bypassRoutes; + } else if(modeltype==&routing_models[SURF_MODEL_FLOYD]) { + dict_bypassRoutes = ((routing_component_floyd_t)rc)->bypassRoutes; + } else if(modeltype==&routing_models[SURF_MODEL_DIJKSTRA]|| + modeltype==&routing_models[SURF_MODEL_DIJKSTRACACHE]) { + dict_bypassRoutes = ((routing_component_dijkstra_t)rc)->bypassRoutes; + } else xbt_die("\"generic_set_bypassroute\" not support"); + + + routing_component_t src_as, dst_as; + int index_src, index_dst; + xbt_dynar_t path_src = NULL; + xbt_dynar_t path_dst = NULL; + routing_component_t current = NULL; + routing_component_t* current_src = NULL; + routing_component_t* current_dst = NULL; + + /* (1) find the as where the src and dst are located */ + src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src); + dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst); + xbt_assert2(src_as&&dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found",src,dst); + + /* (2) find the path to the root routing component */ + path_src = xbt_dynar_new(sizeof(routing_component_t), NULL); + current = src_as; + while( current != NULL ) { + xbt_dynar_push(path_src,¤t); + current = current->routing_father; + } + path_dst = xbt_dynar_new(sizeof(routing_component_t), NULL); + current = dst_as; + while( current != NULL ) { + xbt_dynar_push(path_dst,¤t); + current = current->routing_father; + } + + /* (3) find the common father */ + index_src = (path_src->used)-1; + index_dst = (path_dst->used)-1; + current_src = xbt_dynar_get_ptr(path_src,index_src); + current_dst = xbt_dynar_get_ptr(path_dst,index_dst); + while( index_src >= 0 && index_dst >= 0 && *current_src == *current_dst ) { + routing_component_t *tmp_src,*tmp_dst; + tmp_src = xbt_dynar_pop_ptr(path_src); + tmp_dst = xbt_dynar_pop_ptr(path_dst); + index_src--; + index_dst--; + current_src = xbt_dynar_get_ptr(path_src,index_src); + current_dst = xbt_dynar_get_ptr(path_dst,index_dst); + } - printf("-- print all the example routes --\n"); + int max_index_src = (path_src->used)-1; + int max_index_dst = (path_dst->used)-1; - const char* names[] = { "11.A","11.B","11.C", - "121.A","121.B", - "122.A", - "13.A","13.B" }; - unsigned int i,j,total = 3+2+1+2; - - xbt_dynar_t links; - void* link; - for(i=0;iget_route))(names[i],names[j]); - printf("route from %s to %s >>> ",names[i],names[j]); - if(links) { - unsigned int cpt=0; - xbt_dynar_foreach(links, cpt, link) { - s_surf_resource_t* generic_resource = link; - printf(" %s",generic_resource->name); - } - } else { - printf("NULL"); + int max_index = max(max_index_src,max_index_dst); + int i, max; + + route_extended_t e_route_bypass = NULL; + + for( max=0;max<=max_index;max++) + { + for(i=0;iname, + (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,max)))->name); + e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name); + xbt_free(route_name); } - printf("\n"); + if( e_route_bypass ) break; + if( max <= max_index_src && i <= max_index_dst ) { + char* route_name = bprintf("%s#%s", + (*(routing_component_t*)(xbt_dynar_get_ptr(path_src,max)))->name, + (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,i)))->name); + e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name); + xbt_free(route_name); + } + if( e_route_bypass ) break; } + + if( e_route_bypass ) break; + + if( max <= max_index_src && max <= max_index_dst ) { + char* route_name = bprintf("%s#%s", + (*(routing_component_t*)(xbt_dynar_get_ptr(path_src,max)))->name, + (*(routing_component_t*)(xbt_dynar_get_ptr(path_dst,max)))->name); + e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes,route_name); + xbt_free(route_name); + } + if( e_route_bypass ) break; } + + xbt_dynar_free(&path_src); + xbt_dynar_free(&path_dst); - printf("-- /////////////////////////////////////--\n"); - printf("-- /////////////////////////////////////--\n"); + route_extended_t new_e_route = NULL; + + if(e_route_bypass) { + void* link; + unsigned int cpt=0; + new_e_route = xbt_new0(s_route_extended_t,1); + new_e_route->src_gateway = e_route_bypass->src_gateway; + new_e_route->dst_gateway = e_route_bypass->dst_gateway; + new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + xbt_dynar_foreach(e_route_bypass->generic_route.link_list, cpt, link) { + xbt_dynar_push(new_e_route->generic_route.link_list,&link); + } + } + return new_e_route; +} -links = (*(global_routing->get_route))(names[0],names[5]); +/* ************************************************************************** */ +/* ************************* GENERIC AUX FUNCTIONS ************************** */ -if(links) { -unsigned int cpt=0; +static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void* data, int order) { + + char *link_name; + route_extended_t e_route, new_e_route; + route_t route; + unsigned int cpt; + xbt_dynar_t links, links_id; + + new_e_route = xbt_new0(s_route_extended_t,1); + new_e_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); + new_e_route->src_gateway = NULL; + new_e_route->dst_gateway = NULL; -printf("route from %s to %s >>> ",names[0],names[5]); - xbt_dynar_foreach(links, cpt, link) { - s_surf_resource_t* generic_resource = link; - printf(" %s",generic_resource->name); + xbt_assert0(hierarchy == SURF_ROUTING_BASE || hierarchy == SURF_ROUTING_RECURSIVE, + "the hierarchy type is not defined"); + + if(hierarchy == SURF_ROUTING_BASE ) { + + route = (route_t)data; + links = route->link_list; + + } else if(hierarchy == SURF_ROUTING_RECURSIVE ) { + + e_route = (route_extended_t)data; + xbt_assert0(e_route->src_gateway&&e_route->dst_gateway,"bad gateway, is null"); + links = e_route->generic_route.link_list; + + /* remeber not erase the gateway names */ + new_e_route->src_gateway = e_route->src_gateway; + new_e_route->dst_gateway = e_route->dst_gateway; + } + + links_id = new_e_route->generic_route.link_list; + + xbt_dynar_foreach(links, cpt, link_name) { + + void* link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + if (link) + { + if( order ) + xbt_dynar_push(links_id,&link); + else + xbt_dynar_unshift(links_id,&link); + } + else + THROW1(mismatch_error,0,"Link %s not found", link_name); } -} else { - printf("NULL"); + + return new_e_route; } -printf("\n"); - - - printf("---------- call finalize ---------\n"); - (*(global_routing->finalize))(); - printf("----------------------------------\n"); - - exit(0); - - printf("-------- print tree elements -----\n"); - print_tree(global_routing->root); - printf("----------------------------------\n\n"); - - printf("-------- network_elements --------\n"); - print_global(); - printf("----------------------------------\n\n"); - -// char* names[] = { "11.A","11.B","11.C","121.A","121.B","122.A","13.A","13.B"}; -// int i,j,total = 8; - -// printf("-- print all the example routes --\n"); -// char* names[] = { "11.A","11.B","11.C"}; -// int i,j,total = 3; - -// char* names[] = { "141.A","141.B","143.A","143.B"}; -// int i,j,total = 4; - -// char* names[] = { "142.A","142.B","142.C" }; -// int i,j,total = 3; - -// char* names[] = { "142.A","142.B","142.C", "11.A","11.B","11.C","141.A","141.B","143.A","143.B","11.A","11.B","11.C","121.A","121.B","122.A","13.A","13.B"}; -// int i,j,total = 3+4+8+3; - -// const char* names[] = { "11.A","11.B","11.C", -// "121.A","121.B", -// "122.A", -// "13.A","13.B", -// "141.A","141.B", -// "142.A","142.B","142.C", -// "143.A","143.B", -// "15.A","15.B","15.C"}; -// unsigned int i,j,total = 3+2+1+2+2+3+2+3; - -// printf("-- print all the example routes --\n"); -// xbt_dynar_t links; -// void* link; -// for(i=0;iget_route))(names[i],names[j]); -// printf("route from %s to %s >>> ",names[i],names[j]); -// unsigned int cpt=0; -// xbt_dynar_foreach(links, cpt, link) { -// s_surf_resource_t* generic_resource = link; -// printf(" %s",generic_resource->name); -// } -// printf("\n"); -// } -// } -// -// printf("----------------------------------\n\n"); -// -// printf("---------- call finalize ---------\n"); -// (*(global_routing->finalize))(); -// printf("----------------------------------\n"); -// -// exit(0); + +static void generic_free_extended_route(route_extended_t e_route) { + if(e_route) { + xbt_dynar_free(&(e_route->generic_route.link_list)); + if(e_route->src_gateway) xbt_free(e_route->src_gateway); + if(e_route->dst_gateway) xbt_free(e_route->dst_gateway); + xbt_free(e_route); + } } -//////////////////////////////////////////////////////////////////////////////// -// HERE END THE NEW CODE -//////////////////////////////////////////////////////////////////////////////// - -// /* ************************************************************************** */ -// /* *************************** FULL ROUTING ********************************* */ -// typedef struct { -// s_routing_t generic_routing; -// xbt_dynar_t *routing_table; -// void *loopback; -// size_t size_of_link; -// } s_routing_full_t,*routing_full_t; -// -// #define ROUTE_FULL(i,j) ((routing_full_t)used_routing)->routing_table[(i)+(j)*(used_routing)->host_count] -// #define HOST2ROUTER(id) ((id)+(2<<29)) -// #define ROUTER2HOST(id) ((id)-(2>>29)) -// #define ISROUTER(id) ((id)>=(2<<29)) -// -// /* -// * Free the onelink routes -// */ -// static void onelink_route_elem_free(void *e) { -// s_onelink_t tmp = (s_onelink_t)e; -// if(tmp) { -// free(tmp); -// } -// } -// -// /* -// * Parsing -// */ -// static void routing_full_parse_Shost(void) { -// int *val = xbt_malloc(sizeof(int)); -// DEBUG2("Seen host %s (#%d)",A_surfxml_host_id,used_routing->host_count); -// *val = used_routing->host_count++; -// xbt_dict_set(used_routing->host_id,A_surfxml_host_id,val,xbt_free); -// #ifdef HAVE_TRACING -// TRACE_surf_host_define_id (A_surfxml_host_id, *val); -// #endif -// } -// -// static void routing_full_parse_Srouter(void) { -// int *val = xbt_malloc(sizeof(int)); -// DEBUG3("Seen router %s (%d -> #%d)",A_surfxml_router_id,used_routing->router_count, -// HOST2ROUTER(used_routing->router_count)); -// *val = HOST2ROUTER(used_routing->router_count++); -// xbt_dict_set(used_routing->host_id,A_surfxml_router_id,val,xbt_free); -// #ifdef HAVE_TRACING -// TRACE_surf_host_define_id (A_surfxml_host_id, *val); -// TRACE_surf_host_declaration (A_surfxml_host_id, 0); -// #endif -// } -// -// static int src_id = -1; -// static int dst_id = -1; -// static void routing_full_parse_Sroute_set_endpoints(void) -// { -// src_id = *(int*)xbt_dict_get(used_routing->host_id,A_surfxml_route_src); -// dst_id = *(int*)xbt_dict_get(used_routing->host_id,A_surfxml_route_dst); -// DEBUG4("Route %s %d -> %s %d",A_surfxml_route_src,src_id,A_surfxml_route_dst,dst_id); -// route_action = A_surfxml_route_action; -// } -// -// static void routing_full_parse_Eroute(void) -// { -// char *name; -// if (src_id != -1 && dst_id != -1) { -// name = bprintf("%x#%x", src_id, dst_id); -// manage_route(route_table, name, route_action, 0); -// free(name); -// } -// } -// -// /* Cluster tag functions */ -// -// static void routing_full_parse_change_cpu_data(const char *hostName, -// const char *surfxml_host_power, -// const char *surfxml_host_availability, -// const char *surfxml_host_availability_file, -// const char *surfxml_host_state_file) -// { -// int AX_ptr = 0; -// -// SURFXML_BUFFER_SET(host_id, hostName); -// SURFXML_BUFFER_SET(host_power, surfxml_host_power /*hostPower */ ); -// SURFXML_BUFFER_SET(host_availability, surfxml_host_availability); -// SURFXML_BUFFER_SET(host_availability_file, surfxml_host_availability_file); -// SURFXML_BUFFER_SET(host_state_file, surfxml_host_state_file); -// } -// -// static void routing_full_parse_change_link_data(const char *linkName, -// const char *surfxml_link_bandwidth, -// const char *surfxml_link_bandwidth_file, -// const char *surfxml_link_latency, -// const char *surfxml_link_latency_file, -// const char *surfxml_link_state_file) -// { -// int AX_ptr = 0; -// -// SURFXML_BUFFER_SET(link_id, linkName); -// SURFXML_BUFFER_SET(link_bandwidth, surfxml_link_bandwidth); -// SURFXML_BUFFER_SET(link_bandwidth_file, surfxml_link_bandwidth_file); -// SURFXML_BUFFER_SET(link_latency, surfxml_link_latency); -// SURFXML_BUFFER_SET(link_latency_file, surfxml_link_latency_file); -// SURFXML_BUFFER_SET(link_state_file, surfxml_link_state_file); -// } -// -// static void routing_full_parse_Scluster(void) -// { -// static int AX_ptr = 0; -// -// char *cluster_id = A_surfxml_cluster_id; -// char *cluster_prefix = A_surfxml_cluster_prefix; -// char *cluster_suffix = A_surfxml_cluster_suffix; -// char *cluster_radical = A_surfxml_cluster_radical; -// char *cluster_power = A_surfxml_cluster_power; -// char *cluster_bw = A_surfxml_cluster_bw; -// char *cluster_lat = A_surfxml_cluster_lat; -// char *cluster_bb_bw = A_surfxml_cluster_bb_bw; -// char *cluster_bb_lat = A_surfxml_cluster_bb_lat; -// char *backbone_name; -// unsigned int it1,it2; -// char *name1,*name2; -// xbt_dynar_t names = NULL; -// surfxml_bufferstack_push(1); -// -// /* Make set a set to parse the prefix/suffix/radical into a neat list of names */ -// DEBUG4("Make ", -// cluster_id,cluster_prefix,cluster_suffix,cluster_radical); -// SURFXML_BUFFER_SET(set_id, cluster_id); -// SURFXML_BUFFER_SET(set_prefix, cluster_prefix); -// SURFXML_BUFFER_SET(set_suffix, cluster_suffix); -// SURFXML_BUFFER_SET(set_radical, cluster_radical); -// -// SURFXML_START_TAG(set); -// SURFXML_END_TAG(set); -// -// names = xbt_dict_get(set_list,cluster_id); -// -// xbt_dynar_foreach(names,it1,name1) { -// /* create the host */ -// routing_full_parse_change_cpu_data(name1, cluster_power, "1.0", "", ""); -// A_surfxml_host_state = A_surfxml_host_state_ON; -// -// SURFXML_START_TAG(host); -// SURFXML_END_TAG(host); -// -// /* Here comes the link */ -// routing_full_parse_change_link_data(name1, cluster_bw, "", cluster_lat, "", ""); -// A_surfxml_link_state = A_surfxml_link_state_ON; -// A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; -// -// SURFXML_START_TAG(link); -// SURFXML_END_TAG(link); -// } -// -// /* Make backbone link */ -// backbone_name = bprintf("%s_bb", cluster_id); -// routing_full_parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "", -// ""); -// A_surfxml_link_state = A_surfxml_link_state_ON; -// A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE; -// -// SURFXML_START_TAG(link); -// SURFXML_END_TAG(link); -// -// /* And now the internal routes */ -// xbt_dynar_foreach(names,it1,name1) { -// xbt_dynar_foreach(names,it2,name2) { -// if (strcmp(name1,name2)) { -// A_surfxml_route_action = A_surfxml_route_action_POSTPEND; -// SURFXML_BUFFER_SET(route_src,name1); -// SURFXML_BUFFER_SET(route_dst,name2); -// SURFXML_START_TAG(route); { -// /* FIXME: name1 link is added by error about 20 lines below, so don't add it here -// SURFXML_BUFFER_SET(link_c_ctn_id, name1); -// SURFXML_START_TAG(link_c_ctn); -// SURFXML_END_TAG(link_c_ctn); -// */ -// SURFXML_BUFFER_SET(link_c_ctn_id, backbone_name); -// SURFXML_START_TAG(link_c_ctn); -// SURFXML_END_TAG(link_c_ctn); -// -// SURFXML_BUFFER_SET(link_c_ctn_id, name2); -// SURFXML_START_TAG(link_c_ctn); -// SURFXML_END_TAG(link_c_ctn); -// -// } SURFXML_END_TAG(route); -// } -// } -// } -// -// /* Make route multi with the outside world, i.e. cluster->$* */ -// -// /* FIXME -// * This also adds an elements to the routes within the cluster, -// * and I guess it's wrong, but since this element is commented out in the above -// * code creating the internal routes, we're good. -// * To fix it, I'd say that we need a way to understand "$*-${cluster_id}" as "whole world, but the guys in that cluster" -// * But for that, we need to install a real expression parser for src/dst attributes -// * -// * FIXME -// * This also adds a dumb element (the private link) in place of the loopback. Then, since -// * the loopback is added only if no link to self already exist, this fails. -// * That's really dumb. -// * -// * FIXME -// * It seems to me that it does not add the backbone to the path to outside world... -// */ -// SURFXML_BUFFER_SET(route_c_multi_src, cluster_id); -// SURFXML_BUFFER_SET(route_c_multi_dst, "$*"); -// A_surfxml_route_c_multi_symmetric = A_surfxml_route_c_multi_symmetric_NO; -// A_surfxml_route_c_multi_action = A_surfxml_route_c_multi_action_PREPEND; -// -// SURFXML_START_TAG(route_c_multi); -// -// SURFXML_BUFFER_SET(link_c_ctn_id, "$src"); -// -// SURFXML_START_TAG(link_c_ctn); -// SURFXML_END_TAG(link_c_ctn); -// -// SURFXML_END_TAG(route_c_multi); -// -// free(backbone_name); -// -// /* Restore buff */ -// surfxml_bufferstack_pop(1); -// } -// -// -// static void routing_full_parse_end(void) { -// routing_full_t routing = (routing_full_t) used_routing; -// int nb_link = 0; -// unsigned int cpt = 0; -// xbt_dict_cursor_t cursor = NULL; -// char *key, *data, *end; -// const char *sep = "#"; -// xbt_dynar_t links, keys; -// char *link_name = NULL; -// int i,j; -// -// int host_count = routing->generic_routing.host_count; -// -// /* Create the routing table */ -// routing->routing_table = xbt_new0(xbt_dynar_t, host_count * host_count); -// for (i=0;isize_of_link,NULL); -// -// /* Put the routes in position */ -// xbt_dict_foreach(route_table, cursor, key, data) { -// nb_link = 0; -// links = (xbt_dynar_t) data; -// keys = xbt_str_split_str(key, sep); -// -// src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16); -// dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); -// xbt_dynar_free(&keys); -// -// if(xbt_dynar_length(links) == 1){ -// s_onelink_t new_link = (s_onelink_t) xbt_malloc0(sizeof(s_onelink)); -// new_link->src_id = src_id; -// new_link->dst_id = dst_id; -// link_name = xbt_dynar_getfirst_as(links, char*); -// new_link->link_ptr = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); -// DEBUG3("Adding onelink route from (#%d) to (#%d), link_name %s",src_id, dst_id, link_name); -// xbt_dict_set(onelink_routes, link_name, (void *)new_link, onelink_route_elem_free); -// #ifdef HAVE_TRACING -// TRACE_surf_link_save_endpoints (link_name, src_id, dst_id); -// #endif -// } -// -// if(ISROUTER(src_id) || ISROUTER(dst_id)) { -// DEBUG2("There is route with a router here: (%d ,%d)",src_id,dst_id); -// /* Check there is only one link in the route and store the information */ -// continue; -// } -// -// DEBUG4("Handle %d %d (from %d hosts): %ld links", -// src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links)); -// xbt_dynar_foreach(links, cpt, link_name) { -// void* link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); -// if (link) -// xbt_dynar_push(ROUTE_FULL(src_id,dst_id),&link); -// else -// THROW1(mismatch_error,0,"Link %s not found", link_name); -// } -// } -// -// /* Add the loopback if needed */ -// for (i = 0; i < host_count; i++) -// if (!xbt_dynar_length(ROUTE_FULL(i, i))) -// xbt_dynar_push(ROUTE_FULL(i,i),&routing->loopback); -// -// /* Shrink the dynar routes (save unused slots) */ -// for (i=0;ihost_count; i++) -// for (j = 0; j < used_routing->host_count; j++) -// xbt_dynar_free(&ROUTE_FULL(i, j)); -// free(routing->routing_table); -// xbt_dict_free(&used_routing->host_id); -// xbt_dict_free(&onelink_routes); -// free(routing); -// routing=NULL; -// } -// } -// -// static void routing_model_full_create(size_t size_of_link,void *loopback) { -// /* initialize our structure */ -// routing_full_t routing = xbt_new0(s_routing_full_t,1); -// routing->generic_routing.name = "Full"; -// routing->generic_routing.host_count = 0; -// routing->generic_routing.get_route = routing_full_get_route; -// routing->generic_routing.get_onelink_routes = routing_full_get_onelink_routes; -// routing->generic_routing.is_router = routing_full_is_router; -// routing->generic_routing.finalize = routing_full_finalize; -// -// routing->size_of_link = size_of_link; -// routing->loopback = loopback; -// -// /* Set it in position */ -// used_routing = (routing_t) routing; -// -// /* Set the dict for onehop routes */ -// onelink_routes = xbt_dict_new(); -// -// routing->generic_routing.host_id = xbt_dict_new(); -// -// /* Setup the parsing callbacks we need */ -// // surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost); -// // surfxml_add_callback(STag_surfxml_router_cb_list, &routing_full_parse_Srouter); -// // surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_full_parse_end); -// // surfxml_add_callback(STag_surfxml_route_cb_list, &routing_full_parse_Sroute_set_endpoints); -// // surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute); -// // surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_full_parse_Scluster); -// -// // surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost); -// // surfxml_add_callback(STag_surfxml_router_cb_list, &routing_full_parse_Srouter); -// -// } +static routing_component_t generic_as_exist(routing_component_t find_from, routing_component_t to_find) { + xbt_dict_cursor_t cursor = NULL; + char *key; + int found=0; + routing_component_t elem; + xbt_dict_foreach(find_from->routing_sons, cursor, key, elem) { + if( to_find == elem || generic_as_exist(elem,to_find) ){ + found=1; + break; + } + } + if(found) return to_find; + return NULL; +} -/* ************************************************************************** */ +static routing_component_t generic_autonomous_system_exist(routing_component_t rc, char* element) { + routing_component_t element_as, result, elem; + xbt_dict_cursor_t cursor = NULL; + char *key; + element_as = xbt_dict_get_or_null(global_routing->where_network_elements,element); + result = ((routing_component_t)-1); + if(element_as!=rc) + result = generic_as_exist(rc,element_as); + + if(result) + { + xbt_dict_foreach(element_as->routing_sons, cursor, key, elem) { + if( !strcmp(elem->name,element) ) return element_as; + } + } + return NULL; +} -// static void routing_shortest_path_parse_Scluster(void) -// { -// static int AX_ptr = 0; -// -// char *cluster_id = A_surfxml_cluster_id; -// char *cluster_prefix = A_surfxml_cluster_prefix; -// char *cluster_suffix = A_surfxml_cluster_suffix; -// char *cluster_radical = A_surfxml_cluster_radical; -// char *cluster_power = A_surfxml_cluster_power; -// char *cluster_bb_bw = A_surfxml_cluster_bb_bw; -// char *cluster_bb_lat = A_surfxml_cluster_bb_lat; -// char *backbone_name; -// -// surfxml_bufferstack_push(1); -// -// /* Make set */ -// SURFXML_BUFFER_SET(set_id, cluster_id); -// SURFXML_BUFFER_SET(set_prefix, cluster_prefix); -// SURFXML_BUFFER_SET(set_suffix, cluster_suffix); -// SURFXML_BUFFER_SET(set_radical, cluster_radical); -// -// SURFXML_START_TAG(set); -// SURFXML_END_TAG(set); -// -// /* Make foreach */ -// SURFXML_BUFFER_SET(foreach_set_id, cluster_id); -// -// SURFXML_START_TAG(foreach); -// -// /* Make host for the foreach */ -// routing_full_parse_change_cpu_data("$1", cluster_power, "1.0", "", ""); -// A_surfxml_host_state = A_surfxml_host_state_ON; -// -// SURFXML_START_TAG(host); -// SURFXML_END_TAG(host); -// -// SURFXML_END_TAG(foreach); -// -// /* Make backbone link */ -// backbone_name = bprintf("%s_bb", cluster_id); -// routing_full_parse_change_link_data(backbone_name, cluster_bb_bw, "", cluster_bb_lat, "", -// ""); -// A_surfxml_link_state = A_surfxml_link_state_ON; -// A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE; -// -// SURFXML_START_TAG(link); -// SURFXML_END_TAG(link); -// -// free(backbone_name); -// -// /* Restore buff */ -// surfxml_bufferstack_pop(1); -// } -// -// /* ************************************************************************** */ -// /* *************************** FLOYD ROUTING ********************************* */ -// typedef struct { -// s_routing_t generic_routing; -// int *predecessor_table; -// void** link_table; -// xbt_dynar_t last_route; -// void *loopback; -// size_t size_of_link; -// } s_routing_floyd_t,*routing_floyd_t; -// -// #define FLOYD_COST(i,j) cost_table[(i)+(j)*(used_routing)->host_count] -// #define FLOYD_PRED(i,j) ((routing_floyd_t)used_routing)->predecessor_table[(i)+(j)*(used_routing)->host_count] -// #define FLOYD_LINK(i,j) ((routing_floyd_t)used_routing)->link_table[(i)+(j)*(used_routing)->host_count] -// -// static void routing_floyd_parse_end(void) { -// -// routing_floyd_t routing = (routing_floyd_t) used_routing; -// int nb_link = 0; -// void* link_list = NULL; -// double * cost_table; -// xbt_dict_cursor_t cursor = NULL; -// char *key,*data, *end; -// const char *sep = "#"; -// xbt_dynar_t links, keys; -// -// unsigned int i,j; -// unsigned int a,b,c; -// int host_count = routing->generic_routing.host_count; -// char * link_name = NULL; -// void * link = NULL; -// -// /* Create Cost, Predecessor and Link tables */ -// cost_table = xbt_new0(double, host_count * host_count); //link cost from host to host -// routing->predecessor_table = xbt_new0(int, host_count*host_count); //predecessor host numbers -// routing->link_table = xbt_new0(void*,host_count*host_count); //actual link between src and dst -// routing->last_route = xbt_dynar_new(routing->size_of_link, NULL); -// -// /* Initialize costs and predecessors*/ -// for(i = 0; igeneric_routing.host_count,xbt_dynar_length(links)); -// xbt_assert3(xbt_dynar_length(links) == 1, "%ld links in route between host %d and %d, should be 1", xbt_dynar_length(links), src_id, dst_id); -// -// link_name = xbt_dynar_getfirst_as(links, char*); -// link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); -// -// if (link) -// link_list = link; -// else -// THROW1(mismatch_error,0,"Link %s not found", link_name); -// -// -// FLOYD_LINK(src_id,dst_id) = link_list; -// FLOYD_PRED(src_id, dst_id) = src_id; -// -// //link cost -// FLOYD_COST(src_id, dst_id) = 1; // assume 1 for now -// -// } -// -// /* Add the loopback if needed */ -// for (i = 0; i < host_count; i++) -// if (!FLOYD_PRED(i, i)) { -// FLOYD_PRED(i, i) = i; -// FLOYD_COST(i, i) = 1; -// FLOYD_LINK(i, i) = routing->loopback; -// } -// -// -// //Calculate path costs -// -// for(c=0;clast_route); -// -// do { -// prev_pred = pred; -// pred = FLOYD_PRED(src_id, pred); -// -// if(pred == -1) // if no pred in route -> no route to host -// break; -// -// xbt_dynar_unshift(routing->last_route, &FLOYD_LINK(pred,prev_pred)); -// -// } while(pred != src_id); -// -// xbt_assert2(pred != -1, "no route from host %d to %d", src_id, dst_id); -// -// return routing->last_route; -// } -// -// static void routing_floyd_finalize(void) { -// routing_floyd_t routing = (routing_floyd_t)used_routing; -// -// if (routing) { -// free(routing->link_table); -// free(routing->predecessor_table); -// xbt_dynar_free(&routing->last_route); -// xbt_dict_free(&used_routing->host_id); -// free(routing); -// routing=NULL; -// } -// } -// -// static xbt_dict_t routing_floyd_get_onelink_routes(void){ -// xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model Floyd"); -// } -// -// static int routing_floyd_is_router(int id){ -// xbt_assert0(0,"The get_is_router feature is not supported in routing model Floyd"); -// } -// -// static void routing_model_floyd_create(size_t size_of_link,void *loopback) { -// /* initialize our structure */ -// routing_floyd_t routing = xbt_new0(s_routing_floyd_t,1); -// routing->generic_routing.name = "Floyd"; -// routing->generic_routing.host_count = 0; -// routing->generic_routing.host_id = xbt_dict_new(); -// routing->generic_routing.get_route = routing_floyd_get_route; -// routing->generic_routing.get_onelink_routes = routing_floyd_get_onelink_routes; -// routing->generic_routing.is_router = routing_floyd_is_router; -// routing->generic_routing.finalize = routing_floyd_finalize; -// routing->size_of_link = size_of_link; -// routing->loopback = loopback; -// -// /* Set it in position */ -// used_routing = (routing_t) routing; -// -// /* Setup the parsing callbacks we need */ -// surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost); -// surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_floyd_parse_end); -// surfxml_add_callback(STag_surfxml_route_cb_list, -// &routing_full_parse_Sroute_set_endpoints); -// surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute); -// surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_shortest_path_parse_Scluster); -// -// } -// -// /* ************************************************************************** */ -// /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ -// typedef struct { -// s_routing_t generic_routing; -// xbt_graph_t route_graph; -// xbt_dict_t graph_node_map; -// xbt_dict_t route_cache; -// xbt_dynar_t last_route; -// int cached; -// void *loopback; -// size_t size_of_link; -// } s_routing_dijkstra_t,*routing_dijkstra_t; -// -// -// typedef struct graph_node_data { -// int id; -// int graph_id; //used for caching internal graph id's -// } s_graph_node_data_t, * graph_node_data_t; -// -// typedef struct graph_node_map_element { -// xbt_node_t node; -// } s_graph_node_map_element_t, * graph_node_map_element_t; -// -// typedef struct route_cache_element { -// int * pred_arr; -// int size; -// } s_route_cache_element_t, * route_cache_element_t; -// -// /* -// * Free functions -// */ -// static void route_cache_elem_free(void *e) { -// route_cache_element_t elm=(route_cache_element_t)e; -// -// if (elm) { -// free(elm->pred_arr); -// free(elm); -// } -// } -// -// static void graph_node_map_elem_free(void *e) { -// graph_node_map_element_t elm = (graph_node_map_element_t)e; -// -// if(elm) { -// free(elm); -// } -// } -// -// /* -// * Utility functions -// */ -// static xbt_node_t route_graph_new_node(int id, int graph_id) { -// xbt_node_t node = NULL; -// graph_node_data_t data = NULL; -// graph_node_map_element_t elm = NULL; -// routing_dijkstra_t routing = (routing_dijkstra_t) used_routing; -// -// data = xbt_new0(struct graph_node_data, sizeof(struct graph_node_data)); -// data->id = id; -// data->graph_id = graph_id; -// node = xbt_graph_new_node(routing->route_graph, data); -// -// elm = xbt_new0(struct graph_node_map_element, sizeof(struct graph_node_map_element)); -// elm->node = node; -// xbt_dict_set_ext(routing->graph_node_map, (char*)(&id), sizeof(int), (xbt_set_elm_t)elm, &graph_node_map_elem_free); -// -// return node; -// } -// -// static graph_node_map_element_t graph_node_map_search(int id) { -// routing_dijkstra_t routing = (routing_dijkstra_t) used_routing; -// -// graph_node_map_element_t elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&id), sizeof(int)); -// -// return elm; -// } -// -// /* -// * Parsing -// */ -// static void route_new_dijkstra(int src_id, int dst_id, void* link) { -// routing_dijkstra_t routing = (routing_dijkstra_t) used_routing; -// -// xbt_node_t src = NULL; -// xbt_node_t dst = NULL; -// graph_node_map_element_t src_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&src_id), sizeof(int)); -// graph_node_map_element_t dst_elm = (graph_node_map_element_t)xbt_dict_get_or_null_ext(routing->graph_node_map, (char*)(&dst_id), sizeof(int)); -// -// if(src_elm) -// src = src_elm->node; -// -// if(dst_elm) -// dst = dst_elm->node; -// -// //add nodes if they don't exist in the graph -// if(src_id == dst_id && src == NULL && dst == NULL) { -// src = route_graph_new_node(src_id, -1); -// dst = src; -// } else { -// if(src == NULL) { -// src = route_graph_new_node(src_id, -1); -// } -// -// if(dst == NULL) { -// dst = route_graph_new_node(dst_id, -1); -// } -// } -// -// //add link as edge to graph -// xbt_graph_new_edge(routing->route_graph, src, dst, link); -// -// } -// -// static void add_loopback_dijkstra(void) { -// routing_dijkstra_t routing = (routing_dijkstra_t) used_routing; -// -// xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph); -// -// xbt_node_t node = NULL; -// unsigned int cursor2; -// xbt_dynar_foreach(nodes, cursor2, node) { -// xbt_dynar_t out_edges = xbt_graph_node_get_outedges(node); -// xbt_edge_t edge = NULL; -// unsigned int cursor; -// -// int found = 0; -// xbt_dynar_foreach(out_edges, cursor, edge) { -// xbt_node_t other_node = xbt_graph_edge_get_target(edge); -// if(other_node == node) { -// found = 1; -// break; -// } -// } -// -// if(!found) -// xbt_graph_new_edge(routing->route_graph, node, node, &routing->loopback); -// } -// } -// -// static void routing_dijkstra_parse_end(void) { -// routing_dijkstra_t routing = (routing_dijkstra_t) used_routing; -// int nb_link = 0; -// xbt_dict_cursor_t cursor = NULL; -// char *key, *data, *end; -// const char *sep = "#"; -// xbt_dynar_t links, keys; -// char* link_name = NULL; -// void* link = NULL; -// xbt_node_t node = NULL; -// unsigned int cursor2; -// xbt_dynar_t nodes = NULL; -// /* Create the topology graph */ -// routing->route_graph = xbt_graph_new_graph(1, NULL); -// routing->graph_node_map = xbt_dict_new(); -// routing->last_route = xbt_dynar_new(routing->size_of_link, NULL); -// if(routing->cached) -// routing->route_cache = xbt_dict_new(); -// -// -// /* Put the routes in position */ -// xbt_dict_foreach(route_table, cursor, key, data) { -// nb_link = 0; -// links = (xbt_dynar_t) data; -// keys = xbt_str_split_str(key, sep); -// -// src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16); -// dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); -// xbt_dynar_free(&keys); -// -// DEBUG4("Handle %d %d (from %d hosts): %ld links", -// src_id,dst_id,routing->generic_routing.host_count,xbt_dynar_length(links)); -// -// xbt_assert3(xbt_dynar_length(links) == 1, "%ld links in route between host %d and %d, should be 1", xbt_dynar_length(links), src_id, dst_id); -// -// link_name = xbt_dynar_getfirst_as(links, char*); -// link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); -// if (link) -// route_new_dijkstra(src_id,dst_id,link); -// else -// THROW1(mismatch_error,0,"Link %s not found", link_name); -// -// } -// -// /* Add the loopback if needed */ -// add_loopback_dijkstra(); -// -// /* initialize graph indexes in nodes after graph has been built */ -// nodes = xbt_graph_get_nodes(routing->route_graph); -// -// xbt_dynar_foreach(nodes, cursor2, node) { -// graph_node_data_t data = xbt_graph_node_get_data(node); -// data->graph_id = cursor2; -// } -// -// } -// -// /* -// * Business methods -// */ -// static xbt_dynar_t routing_dijkstra_get_route(int src_id,int dst_id) { -// -// routing_dijkstra_t routing = (routing_dijkstra_t) used_routing; -// int * pred_arr = NULL; -// int src_node_id = 0; -// int dst_node_id = 0; -// int * nodeid = NULL; -// int v; -// int size = 0; -// void * link = NULL; -// route_cache_element_t elm = NULL; -// xbt_dynar_t nodes = xbt_graph_get_nodes(routing->route_graph); -// -// /*Use the graph_node id mapping set to quickly find the nodes */ -// graph_node_map_element_t src_elm = graph_node_map_search(src_id); -// graph_node_map_element_t dst_elm = graph_node_map_search(dst_id); -// xbt_assert2(src_elm != NULL && dst_elm != NULL, "src %d or dst %d does not exist", src_id, dst_id); -// src_node_id = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id; -// dst_node_id = ((graph_node_data_t)xbt_graph_node_get_data(dst_elm->node))->graph_id; -// -// if(routing->cached) { -// /*check if there is a cached predecessor list avail */ -// elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routing->route_cache, (char*)(&src_id), sizeof(int)); -// } -// -// if(elm) { //cached mode and cache hit -// pred_arr = elm->pred_arr; -// } else { //not cached mode or cache miss -// double * cost_arr = NULL; -// xbt_heap_t pqueue = NULL; -// int i = 0; -// -// int nr_nodes = xbt_dynar_length(nodes); -// cost_arr = xbt_new0(double, nr_nodes); //link cost from src to other hosts -// pred_arr = xbt_new0(int, nr_nodes); //predecessors in path from src -// pqueue = xbt_heap_new(nr_nodes, free); -// -// //initialize -// cost_arr[src_node_id] = 0.0; -// -// for(i = 0; i < nr_nodes; i++) { -// if(i != src_node_id) { -// cost_arr[i] = DBL_MAX; -// } -// -// pred_arr[i] = 0; -// -// //initialize priority queue -// nodeid = xbt_new0(int, 1); -// *nodeid = i; -// xbt_heap_push(pqueue, nodeid, cost_arr[i]); -// -// } -// -// // apply dijkstra using the indexes from the graph's node array -// while(xbt_heap_size(pqueue) > 0) { -// int * v_id = xbt_heap_pop(pqueue); -// xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t); -// xbt_dynar_t out_edges = xbt_graph_node_get_outedges(v_node); -// xbt_edge_t edge = NULL; -// unsigned int cursor; -// -// xbt_dynar_foreach(out_edges, cursor, edge) { -// xbt_node_t u_node = xbt_graph_edge_get_target(edge); -// graph_node_data_t data = xbt_graph_node_get_data(u_node); -// int u_id = data->graph_id; -// int cost_v_u = 1; //fixed link cost for now -// -// if(cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) { -// pred_arr[u_id] = *v_id; -// cost_arr[u_id] = cost_v_u + cost_arr[*v_id]; -// nodeid = xbt_new0(int, 1); -// *nodeid = u_id; -// xbt_heap_push(pqueue, nodeid, cost_arr[u_id]); -// } -// } -// -// //free item popped from pqueue -// free(v_id); -// } -// -// free(cost_arr); -// xbt_heap_free(pqueue); -// -// } -// -// //compose route path with links -// xbt_dynar_reset(routing->last_route); -// -// for(v = dst_node_id; v != src_node_id; v = pred_arr[v]) { -// xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t); -// xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t); -// xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v); -// -// xbt_assert2(edge != NULL, "no route between host %d and %d", src_id, dst_id); -// -// link = xbt_graph_edge_get_data(edge); -// xbt_dynar_unshift(routing->last_route, &link); -// size++; -// } -// -// -// if(routing->cached && elm == NULL) { -// //add to predecessor list of the current src-host to cache -// elm = xbt_new0(struct route_cache_element, sizeof(struct route_cache_element)); -// elm->pred_arr = pred_arr; -// elm->size = size; -// xbt_dict_set_ext(routing->route_cache, (char*)(&src_id), sizeof(int), (xbt_set_elm_t)elm, &route_cache_elem_free); -// } -// -// if(!routing->cached) -// free(pred_arr); -// -// return routing->last_route; -// } -// -// -// static void routing_dijkstra_finalize(void) { -// routing_dijkstra_t routing = (routing_dijkstra_t)used_routing; -// -// if (routing) { -// xbt_graph_free_graph(routing->route_graph, &free, NULL, &free); -// xbt_dict_free(&routing->graph_node_map); -// if(routing->cached) -// xbt_dict_free(&routing->route_cache); -// xbt_dynar_free(&routing->last_route); -// xbt_dict_free(&used_routing->host_id); -// free(routing); -// routing=NULL; -// } -// } -// -// static xbt_dict_t routing_dijkstraboth_get_onelink_routes(void){ -// xbt_assert0(0,"The get_onelink_routes feature is not supported in routing model dijkstraboth"); -// } -// -// static int routing_dijkstraboth_is_router(int id){ -// xbt_assert0(0,"The get_is_router feature is not supported in routing model dijkstraboth"); -// } -// -// /* -// * -// */ -// static void routing_model_dijkstraboth_create(size_t size_of_link,void *loopback, int cached) { -// /* initialize our structure */ -// routing_dijkstra_t routing = xbt_new0(s_routing_dijkstra_t,1); -// routing->generic_routing.name = "Dijkstra"; -// routing->generic_routing.host_count = 0; -// routing->generic_routing.get_route = routing_dijkstra_get_route; -// routing->generic_routing.get_onelink_routes = routing_dijkstraboth_get_onelink_routes; -// routing->generic_routing.is_router = routing_dijkstraboth_is_router; -// routing->generic_routing.finalize = routing_dijkstra_finalize; -// routing->size_of_link = size_of_link; -// routing->loopback = loopback; -// routing->cached = cached; -// -// /* Set it in position */ -// used_routing = (routing_t) routing; -// -// /* Setup the parsing callbacks we need */ -// routing->generic_routing.host_id = xbt_dict_new(); -// surfxml_add_callback(STag_surfxml_host_cb_list, &routing_full_parse_Shost); -// surfxml_add_callback(ETag_surfxml_platform_cb_list, &routing_dijkstra_parse_end); -// surfxml_add_callback(STag_surfxml_route_cb_list, -// &routing_full_parse_Sroute_set_endpoints); -// surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_full_parse_Eroute); -// surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_shortest_path_parse_Scluster); -// } -// -// static void routing_model_dijkstra_create(size_t size_of_link,void *loopback) { -// routing_model_dijkstraboth_create(size_of_link, loopback, 0); -// } -// -// static void routing_model_dijkstracache_create(size_t size_of_link,void *loopback) { -// routing_model_dijkstraboth_create(size_of_link, loopback, 1); -// } +static routing_component_t generic_processing_units_exist(routing_component_t rc, char* element) { + routing_component_t element_as; + element_as = xbt_dict_get_or_null(global_routing->where_network_elements,element); + if(element_as==rc) return element_as; + return generic_as_exist(rc,element_as); +} -/* ************************************************** */ -/* ********** NO ROUTING **************************** */ - - -// static void routing_none_finalize(void) { -// if (used_routing) { -// xbt_dict_free(&used_routing->host_id); -// free(used_routing); -// used_routing=NULL; -// } -// } -// -// static void routing_model_none_create(size_t size_of_link,void *loopback) { -// routing_t routing = xbt_new0(s_routing_t,1); -// INFO0("Null routing"); -// routing->name = "none"; -// routing->host_count = 0; -// routing->host_id = xbt_dict_new(); -// routing->get_onelink_routes = NULL; -// routing->is_router = NULL; -// routing->get_route = NULL; -// -// routing->finalize = routing_none_finalize; -// -// /* Set it in position */ -// used_routing = (routing_t) routing; -// } +static void generic_src_dst_check(routing_component_t rc, const char* src, const char* dst) { + + routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src); + routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst); + + xbt_assert3(src_as != NULL && dst_as != NULL, + "Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",src,dst,rc->name); + xbt_assert4(src_as == dst_as, + "The src(%s in %s) and dst(%s in %s) are in differents AS",src,src_as->name,dst,dst_as->name); + xbt_assert2(rc == dst_as, + "The routing component of src and dst is not the same as the network elements belong (%s==%s)",rc->name,dst_as->name); +}