X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e2dd3ecf166c2d82974beb220aeb8dd4200f105..e5b9aba8d360583bd56a42dfa5d49f85f1917616:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index e508683260..d3ec49e1c9 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -13,34 +13,6 @@ #include "xbt/set.h" 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 @@ -48,14 +20,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route,surf,"Routing part of surf"); //...... DEBUG ONLY .... // static void print_tree(routing_component_t rc); -static void print_global(); +static void print_global(void); 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 DEGUB_exit(void); +static void DEBUG_exit(void); //////////////////////////////////////////////////////////////////////////////// // HERE START THE NEW CODE @@ -77,15 +49,12 @@ 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 */ @@ -93,61 +62,199 @@ 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 +// typedef enum { +// SURF_MODEL_FULL = 0, +// SURF_MODEL_FLOYD, +// SURF_MODEL_DIJKSTRA, +// SURF_MODEL_DIJKSTRACACHE, +// SURF_MODEL_NONE +// } e_surf_model_type_t; + +/* 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 */ +static char* gw_dst = NULL; /* temporary store the gateway destination name of a route */ +static xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ + /** * \brief Add a "host" to the network element list - * - * Allows find a "host" in any routing component */ 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), - "The host \"%s\" already exist",A_surfxml_host_id); + "Reading a host, processing unit \"%s\" already exist",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); } /** * \brief Add a "router" to the network element list - * - * Allows find a "router" in any routing component */ 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), - "The router \"%s\" already exist",A_surfxml_router_id); + "Reading a router, processing unit \"%s\" already exist",A_surfxml_router_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 Add a "gateway" to the network element list - * - * Allows find a "gateway" in any routing component + * \brief Set the endponints for a route + */ +static void parse_S_route_new_and_endpoints(void) { + 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; + 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) { + 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; + 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; + 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) { + route_t route = xbt_new0(s_route_t,1); + route->link_list = link_list; + //TODO: NULL? + 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) { + 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: NULL? + 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; + dst = NULL; + gw_src = NULL; + gw_dst = NULL; +} + +/** + * \brief Store the bypass route by calling the set_bypassroute function of the current routing component */ -static void parse_S_gateway(void) { - xbt_assert1(!xbt_dict_get_or_null(global_routing->where_network_elements,A_surfxml_gateway_id), - "The gateway \"%s\" already exist",A_surfxml_gateway_id); - xbt_dict_set(global_routing->where_network_elements,A_surfxml_gateway_id,(void*)current_routing,NULL); +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); + //TODO: NULL? + 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; } /** @@ -171,32 +278,39 @@ 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))(); new_routing->routing = model; + new_routing->hierarchy = SURF_ROUTING_NULL; new_routing->name = xbt_strdup(A_surfxml_AS_id); new_routing->routing_sons = xbt_dict_new(); INFO2("Routing %s for AS %s",A_surfxml_AS_routing,A_surfxml_AS_id); - if( current_routing == NULL && global_routing->root == NULL ) - { /* it is the first one */ + if( current_routing == NULL && global_routing->root == NULL ){ + + /* it is the first one */ new_routing->routing_father = NULL; global_routing->root = new_routing; - } - else if( current_routing != NULL && global_routing->root != NULL ) - { /* it is a part of the tree */ - new_routing->routing_father = current_routing; + + } else if( current_routing != NULL && global_routing->root != NULL ) { + xbt_assert1(!xbt_dict_get_or_null(current_routing->routing_sons,A_surfxml_AS_id), "The AS \"%s\" already exist",A_surfxml_AS_id); + /* it is a part of the tree */ + new_routing->routing_father = current_routing; + /* set the father behavior */ + if( current_routing->hierarchy == SURF_ROUTING_NULL ) current_routing->hierarchy = SURF_ROUTING_RECURSIVE; + /* 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 */ + (*(current_routing->set_autonomous_system))(current_routing,A_surfxml_AS_id); /* unload the prev parse rules */ (*(current_routing->routing->unload))(); - } - else - { + + } else { THROW0(arg_error,0,"All defined components must be belong to a AS"); } /* set the new parse rules */ @@ -216,6 +330,7 @@ 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_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; @@ -224,78 +339,38 @@ 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); - } -} - -/** - * \brief Add a "AS" to the network element list - * - * Allows find a "AS" in any routing component - */ -static void parse_E_platform_add_parse_AS(void) { - _add_parse_AS(global_routing->root); -} - -/* Global Business methods */ +/* Aux Business methods */ /** - * \brief Generic method: find a route between hosts + * \brief Get the AS father and the first elements of the chain * * \param src the source host name * \param dst the destination host name * - * walk through the routing components tree and find a route between hosts - * by calling the differents "get_route" functions in each routing component + * Get the common father of the to processing units, and the first different + * father in the chain */ -static xbt_dynar_t get_route(const char* src,const char* dst) { +static xbt_dynar_t elements_father(const char* src,const char* dst) { + + xbt_assert0(src&&dst,"bad parameters for \"elements_father\" method"); + + xbt_dynar_t result = xbt_dynar_new(sizeof(char*), NULL); // &xbt_free_ref routing_component_t src_as, dst_as; int index_src, index_dst, index_father_src, index_father_dst; - int count_src, count_dst; xbt_dynar_t path_src = NULL; xbt_dynar_t path_dst = NULL; - char *current_router_src, *current_router_dst; routing_component_t current = NULL; - routing_component_t* current_src_father; - routing_component_t* current_dst_father; routing_component_t* current_src = NULL; routing_component_t* current_dst = NULL; - routing_component_t* father; - route_extended_t tmp_route; - void* link; - route_extended_t route_center_links; - xbt_dynar_t path_src_links, path_dst_links, path_first, path_last; - unsigned int cpt; - - xbt_dynar_reset(global_routing->last_route); + routing_component_t* father = NULL; -// TODO: check if the route is between hosts -// xbt_assert2( ( src_ne->type == SURF_NETWORK_ELEMENT_HOST || src_ne-> == SURF_NETWORK_ELEMENT_AS ) -// && ( src_ne->type == SURF_NETWORK_ELEMENT_HOST || src_ne-> == SURF_NETWORK_ELEMENT_AS ) , -// "Invalid network elements \"%s\" or \"%s\" for make a route", src, dst); - - /* (1) find the as-routetree where the src and dst are located */ + /* (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 componen */ + /* (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 ) { @@ -324,113 +399,150 @@ static xbt_dynar_t get_route(const char* src,const char* dst) { index_dst++; current_src = xbt_dynar_get_ptr(path_src,index_src); current_dst = xbt_dynar_get_ptr(path_dst,index_dst); + + /* (4) they are not in the same routing component, make the path */ + index_father_src = index_src+1; + index_father_dst = index_dst+1; + + if(*current_src==*current_dst) + father = current_src; + else + father = xbt_dynar_get_ptr(path_src,index_father_src); - /* (4) if they are in the same routing component? */ - if( *current_src == *current_dst ) { + /* (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 - /* (5.1) belong to the same routing component */ - xbt_assert1((*current_src)->get_route, "Invalid \"get_route\" for \"%s\"",(*current_src)->name); - tmp_route = (*(*current_src)->get_route)(*current_src,src,dst); - xbt_assert3(tmp_route, "there is no route between \"%s\" and \"%s\" in \"%s\"",src,dst,(*current_src)->name); - cpt = 0; - xbt_dynar_foreach(tmp_route->generic_route.link_list, cpt, link) { - xbt_dynar_push(global_routing->last_route,&link); - } - - } else { + xbt_dynar_free(&path_src); + xbt_dynar_free(&path_dst); - /* (5.2) they are not in the same routetree, make the path */ - index_father_src = index_src+1; - index_father_dst = index_dst+1; - father = xbt_dynar_get_ptr(path_src,index_father_src); - xbt_assert1((*father)->get_route, "Invalid \"get_route\" for \"%s\"",(*father)->name); - route_center_links = (*((*father)->get_route))(*father,(*current_src)->name,(*current_dst)->name); - xbt_assert3(route_center_links, "there is no route between \"%s\" and \"%s\" in \"%s\"", - (*current_src)->name,(*current_dst)->name,(*father)->name); - - /* (5.2.1) make the source path */ - path_src_links = xbt_dynar_new(global_routing->size_of_link, NULL); - current_router_dst = route_center_links->src_gateway; /* first router in the reverse path */ - current_src_father = xbt_dynar_get_ptr(path_src,index_src); - index_src--; - for(count_src=index_src;count_src>=0;count_src--) { - current_src = xbt_dynar_get_ptr(path_src,count_src); - xbt_assert1((*current_src_father)->get_route, "Invalid \"get_route\" for \"%s\"",(*current_src_father)->name); - tmp_route = (*((*current_src_father)->get_route))(*current_src_father,(*current_src)->name,current_router_dst); - xbt_assert3(tmp_route, "there is no route between \"%s\" and \"%s\" in \"%s\"", - (*current_src)->name,(*current_dst)->name,(*current_src_father)->name); - cpt = 0; - xbt_dynar_foreach(tmp_route->generic_route.link_list, cpt, link) { - xbt_assert2(link,"NULL link in the route from src %s to dst %s (5.2.1)", src, dst); - xbt_dynar_push(path_src_links,&link); - } - current_router_dst = tmp_route->src_gateway; - current_src_father = current_src; - } + return result; +} + +/* Global Business methods */ + +/** + * \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; + unsigned int cpt=0; + + DEBUG2("Solve route \"%s\" to \"%s\"",src,dst); + + xbt_assert0(src&&dst,"bad parameters for \"_get_route\" method"); + + route_extended_t e_route, e_route_cnt, e_route_src, e_route_dst; + + xbt_dynar_t elem_father_list = elements_father(src,dst); + + routing_component_t common_father = xbt_dynar_get_as(elem_father_list, 0, routing_component_t); + routing_component_t src_father = xbt_dynar_get_as(elem_father_list, 1, routing_component_t); + routing_component_t dst_father = xbt_dynar_get_as(elem_father_list, 2, routing_component_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); + + if(src_father==dst_father) { /* SURF_ROUTING_BASE */ - /* (5.2.2) make the destination path */ - path_dst_links = xbt_dynar_new(global_routing->size_of_link, NULL); - current_router_src = route_center_links->dst_gateway; /* last router in the reverse path */ - current_dst_father = xbt_dynar_get_ptr(path_dst,index_dst); - index_dst--; - for(count_dst=index_dst;count_dst>=0;count_dst--) { - current_dst = xbt_dynar_get_ptr(path_dst,count_dst); - xbt_assert1((*current_dst_father)->get_route, "Invalid \"get_route\" for \"%s\"",(*current_dst_father)->name); - tmp_route = (*((*current_dst_father)->get_route))(*current_dst_father,current_router_src,(*current_dst)->name); - xbt_assert3(tmp_route, "there is no route between \"%s\" and \"%s\" in \"%s\"", - (*current_src)->name,(*current_dst)->name,(*current_dst_father)->name); - cpt = 0; - xbt_dynar_foreach(tmp_route->generic_route.link_list, cpt, link) { - xbt_assert2(link,"NULL link in the route from src %s to dst %s (5.2.1)", src, dst); - xbt_dynar_push(path_dst_links,&link); + 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); } - current_router_src = tmp_route->dst_gateway; - current_dst_father = current_dst; + xbt_dynar_free( &(e_route_cnt->generic_route.link_list) ); + xbt_free(e_route_cnt); } - /* (5.2.3) the first part of the route */ - xbt_assert1((*current_src)->get_route, "Invalid \"get_route\" for \"%s\"",(*current_src)->name); - path_first = ((*((*current_src)->get_route))(*current_src,src,current_router_dst))->generic_route.link_list; - xbt_assert3(path_first, "there is no route between \"%s\" and \"%s\" in \"%s\"", - src,current_router_dst,(*current_src)->name); - - /* (5.2.4) the last part of the route */ - xbt_assert1((*current_dst)->get_route, "Invalid \"get_route\" for \"%s\"",(*current_dst)->name); - path_last = ((*((*current_dst)->get_route))(*current_dst,current_router_src,dst))->generic_route.link_list; - xbt_assert3(path_last, "there is no route between \"%s\" and \"%s\" in \"%s\"", - current_router_src,dst,(*current_dst)->name); + } else { /* SURF_ROUTING_RECURSIVE */ + + route_extended_t e_route_bypass = (*(common_father->get_bypass_route))(common_father,src,dst); - /* (5.2.5) make all paths together */ - // FIXME: the paths non respect the right order + 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); - cpt = 0; - xbt_dynar_foreach(path_first, cpt, link) { - xbt_dynar_push(global_routing->last_route,&link); - } - cpt = 0; - xbt_dynar_foreach(path_src_links, cpt, link) { - xbt_dynar_push(global_routing->last_route,&link); - } - cpt = 0; - xbt_dynar_foreach(route_center_links->generic_route.link_list, cpt, link) { - xbt_dynar_push(global_routing->last_route,&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); + } } - cpt = 0; - xbt_dynar_foreach(path_dst_links, cpt, link) { - xbt_dynar_push(global_routing->last_route,&link); + + xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { + xbt_dynar_push(e_route->generic_route.link_list,&link); } - cpt = 0; - xbt_dynar_foreach(path_last, cpt, link) { - xbt_dynar_push(global_routing->last_route,&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); + } } - xbt_dynar_free(&path_src_links); - xbt_dynar_free(&path_dst_links); + 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(&path_src); - xbt_dynar_free(&path_dst); - + xbt_dynar_free(&elem_father_list); + + return e_route; +} + +/** + * \brief Generic method: find a route between hosts + * + * \param src the source host name + * \param dst the destination host name + * + * walk through the routing components tree and find a route between hosts + * by calling the differents "get_route" functions in each routing component + */ +static xbt_dynar_t get_route(const char* src,const char* dst) { + + if(global_routing->last_route) xbt_dynar_free( &(global_routing->last_route) ); + + route_extended_t e_route; + xbt_dynar_t elem_father_list = elements_father(src,dst); + routing_component_t common_father = xbt_dynar_get_as(elem_father_list, 0, routing_component_t); + + if(strcmp(src,dst)) + e_route = _get_route(src,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; else @@ -457,6 +569,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); } } @@ -501,37 +614,28 @@ void routing_model_create(size_t size_of_links, void* loopback) { /* parse generic elements */ surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host); surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router); - surfxml_add_callback(STag_surfxml_gateway_cb_list, &parse_S_gateway); - /* parse generic elements */ + 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, &DEGUB_exit); - + surfxml_add_callback(ETag_surfxml_platform_cb_list, &DEBUG_exit); } -/* ************************************************************************** */ -/* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */ - -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 */ -static char* gw_dst = NULL; /* temporary store the gateway destination name of a route */ -static xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ - -static void generic_parse_S_route_new_and_endpoints(void); -static void generic_E_link_c_ctn_new_elem(void); -static void generic_parse_E_route_store_route(void); - /* ************************************************************************** */ /* *************************** 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 */ @@ -539,104 +643,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 */ - -static void full_parse_S_host(void) { - network_element_t ne = xbt_new0(s_network_element_t,1); - ne->id = xbt_dict_length(((routing_component_full_t)current_routing)->to_index); - ne->type = SURF_NETWORK_ELEMENT_HOST; - xbt_dict_set(((routing_component_full_t)current_routing)->to_index,A_surfxml_host_id,ne,xbt_free); -} - -static void full_parse_S_gateway(void) { - network_element_t ne = xbt_new0(s_network_element_t,1); - ne->id = xbt_dict_length(((routing_component_full_t)current_routing)->to_index); - ne->type = SURF_NETWORK_ELEMENT_GATEWAY; - xbt_dict_set(((routing_component_full_t)current_routing)->to_index,A_surfxml_gateway_id,ne,xbt_free); -} - /* Business methods */ 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); - xbt_assert1(src && dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name); - - routing_component_full_t src_as, dst_as; - int src_id,dst_id; - network_element_t ne_src,ne_dst; - - // FIXME: here we can use the current_routing var. - 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((routing_component_full_t)rc == dst_as, - "The routing component of src and dst is not the same as the network elements belong"); - - ne_src = (network_element_t) xbt_dict_get(src_as->to_index,src); - ne_dst = (network_element_t) xbt_dict_get(dst_as->to_index,dst); - - src_id = ne_src->id; - dst_id = ne_dst->id; - - xbt_assert0(ne_src != NULL && ne_dst != NULL, "Ask for route \"from\" or \"to\" no found in the local table"); + /* set utils vars */ + routing_component_full_t routing = (routing_component_full_t)rc; + int table_size = xbt_dict_length(routing->to_index); - if( xbt_dynar_length(TO_ROUTE_FULL(src_id,dst_id,src_as)->generic_route.link_list) > 0 ) - return TO_ROUTE_FULL(src_id,dst_id,src_as); - else - return NULL; -} + 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); -static xbt_dict_t full_get_network_elements(routing_component_t rc, e_surf_network_element_type_t req_type) -{ - routing_component_full_t routing = (routing_component_full_t)rc; - xbt_dict_t result = xbt_dict_new(); - xbt_dict_cursor_t cursor = NULL; - char *key; - network_element_t ne; - // TODO: do the next (the AS_GATEWAY are definened in the AS in the this_AS) - if(req_type == SURF_NETWORK_ELEMENT_AS_GATEWAY ) { - xbt_assert0(0, "NOT IMPLEMENTED YET"); - } - // TODO: do the next (the links are not defined for the routing) - if(req_type == SURF_NETWORK_ELEMENT_LINK ) { - xbt_assert0(0, "NOT IMPLEMENTED YET"); - } - // TODO: do the next (the routers are not defined for this type of routing) - if(req_type == SURF_NETWORK_ELEMENT_ROUTER ) { - xbt_assert0(0, "NOT IMPLEMENTED YET"); - } + route_extended_t e_route = NULL; + route_extended_t new_e_route = NULL; + void* link; + unsigned int cpt=0; + + e_route = TO_ROUTE_FULL(*src_id,*dst_id); - xbt_dict_foreach(routing->to_index, cursor, key, ne) { - if( req_type == SURF_NETWORK_ELEMENT_NULL || req_type == ne->type ) { - e_surf_network_element_type_t *new_type = xbt_new0(e_surf_network_element_type_t,1); - *new_type = ne->type; - xbt_dict_set(result,key,new_type,xbt_free); + 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 result; + 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 */ @@ -646,133 +701,89 @@ 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 = 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->generic_routing.get_network_elements = full_get_network_elements; 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_full_load() { - surfxml_add_callback(STag_surfxml_host_cb_list, &full_parse_S_host); - surfxml_add_callback(STag_surfxml_gateway_cb_list, &full_parse_S_gateway); - surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &generic_E_link_c_ctn_new_elem); - surfxml_add_callback(STag_surfxml_route_cb_list, &generic_parse_S_route_new_and_endpoints); - surfxml_add_callback(ETag_surfxml_route_cb_list, &generic_parse_E_route_store_route); +static void model_full_load(void) { + /* use "surfxml_add_callback" to add a parse function call */ } -static void model_full_unload() { - surfxml_del_callback(&STag_surfxml_host_cb_list, &full_parse_S_host); - surfxml_del_callback(&STag_surfxml_gateway_cb_list, &full_parse_S_gateway); - surfxml_del_callback(&ETag_surfxml_link_c_ctn_cb_list, &generic_E_link_c_ctn_new_elem); - surfxml_del_callback(&STag_surfxml_route_cb_list, &generic_parse_S_route_new_and_endpoints); - surfxml_del_callback(&ETag_surfxml_route_cb_list, &generic_parse_E_route_store_route); +static void model_full_unload(void) { + /* use "surfxml_del_callback" to remove a parse function call */ } -static void model_full_end() { - - char *key, *link_name, *src_name, *dst_name, *src_gw_name, *dst_gw_name; +static void model_full_end(void) { + + char *key, *end; //*src_name, *dst_name const char* sep = "#"; - network_element_t src_id, dst_id, ne; - route_extended_t new_e_route; - unsigned int i, j, cpt; - routing_component_t component; - xbt_dynar_t links; + int src_id, dst_id; + unsigned int i, j; + route_t route; + route_extended_t e_route; + void* data; + xbt_dict_cursor_t cursor = NULL; xbt_dynar_t keys = NULL; - routing_component_t src_as; - routing_component_t dst_as; - routing_component_full_t routing = ((routing_component_full_t)current_routing); - - /* Add the AS found to local components */ - xbt_dict_foreach(current_routing->routing_sons, cursor, key, component) { - ne = xbt_new0(s_network_element_t,1); - ne->id = xbt_dict_length(routing->to_index); - ne->type = SURF_NETWORK_ELEMENT_AS; - xbt_dict_set(routing->to_index,key,ne,xbt_free); - } + /* 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 */ routing->routing_table = xbt_new0(route_extended_t, table_size * table_size); - for (i=0;igeneric_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(i,j,current_routing) = new_e_route; - } - } /* Put the routes in position */ - xbt_dict_foreach(routing->parse_routes, cursor, key, links) { - + 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, 16); + dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); + TO_ROUTE_FULL(src_id,dst_id) = generic_new_extended_route(current_routing->hierarchy,data,1); + xbt_dynar_free(&keys); + } - src_name = xbt_dynar_get_as(keys, 0, char*); - dst_name = xbt_dynar_get_as(keys, 1, char*); - src_gw_name = xbt_dynar_get_as(keys, 2, char*); - dst_gw_name = xbt_dynar_get_as(keys, 3, 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); - - if( strlen(src_gw_name) != 0 ) { - src_as = xbt_dict_get_or_null(global_routing->where_network_elements,src_gw_name); - if (src_as == NULL) - THROW1(mismatch_error,0,"Network elements %s not found", src_gw_name); - } else { - src_gw_name = NULL; // FIXME: maybe here put the same src_name. - } - - if( strlen(dst_gw_name) != 0 ) { - dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,dst_gw_name); - if (dst_as == NULL) - THROW1(mismatch_error,0,"Network elements %s not found", dst_gw_name); - } else { - dst_gw_name = NULL; // FIXME: maybe here put the same dst_name. - } - - TO_ROUTE_FULL(src_id->id,dst_id->id,current_routing)->src_gateway = xbt_strdup(src_gw_name); - TO_ROUTE_FULL(src_id->id,dst_id->id,current_routing)->dst_gateway = xbt_strdup(dst_gw_name); - - 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(TO_ROUTE_FULL(src_id->id,dst_id->id,current_routing)->generic_route.link_list,&link); - else - THROW1(mismatch_error,0,"Link %s not found", link_name); - } - - // xbt_dynar_free(&links); - xbt_dynar_free(&keys); - } - /* delete the parse table */ - xbt_dict_foreach(routing->parse_routes, cursor, key, links) { - xbt_dynar_free(&links); + 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 */ - for (i = 0; i < table_size; i++) - if (!xbt_dynar_length(TO_ROUTE_FULL(i, i,current_routing)->generic_route.link_list)) - xbt_dynar_push(TO_ROUTE_FULL(i,i,current_routing)->generic_route.link_list,&global_routing->loopback); + if(current_routing->hierarchy == SURF_ROUTING_BASE) { + for (i = 0; i < table_size; i++) { + e_route = TO_ROUTE_FULL(i, i); + 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) = 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); } /* ************************************************************************** */ @@ -781,338 +792,196 @@ 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; -/* Parse routing model functions */ - -static void floyd_parse_S_host(void) { - network_element_t ne = xbt_new0(s_network_element_t,1); - ne->id = xbt_dict_length(((routing_component_floyd_t)current_routing)->predecessor_to_index); - ne->type = SURF_NETWORK_ELEMENT_HOST; - xbt_dict_set(((routing_component_floyd_t)current_routing)->predecessor_to_index,A_surfxml_host_id,ne,xbt_free); -} - -static void floyd_parse_S_gateway(void) { - network_element_t ne = xbt_new0(s_network_element_t,1); - ne->id = xbt_dict_length(((routing_component_floyd_t)current_routing)->predecessor_to_index); - ne->type = SURF_NETWORK_ELEMENT_GATEWAY; - xbt_dict_set(((routing_component_floyd_t)current_routing)->predecessor_to_index,A_surfxml_gateway_id,ne,xbt_free); -} - -static void floyd_parse_S_router(void) { - network_element_t ne = xbt_new0(s_network_element_t,1); - ne->id = xbt_dict_length(((routing_component_floyd_t)current_routing)->predecessor_to_index); - ne->type = SURF_NETWORK_ELEMENT_ROUTER; - xbt_dict_set(((routing_component_floyd_t)current_routing)->predecessor_to_index,A_surfxml_router_id,ne,xbt_free); -} - -/* Business methods */ +/* Business methods */ static route_extended_t floyd_get_route(routing_component_t rc, const char* src,const char* dst) { - - xbt_assert1(src && dst, "Invalid params for \"get_route\" function at AS \"%s\"",rc->name); + 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->predecessor_to_index); - int AS_table_size; - /* clear the last route */ - xbt_dynar_reset(routing->last_route->generic_route.link_list); - if(routing->last_route->src_gateway) xbt_free(routing->last_route->src_gateway); - if(routing->last_route->dst_gateway) xbt_free(routing->last_route->dst_gateway); - routing->last_route->src_gateway = NULL; - routing->last_route->dst_gateway = NULL; - - /* find the network elements for make a route */ - network_element_t dst_ne = xbt_dict_get_or_null(routing->predecessor_to_index, dst); - network_element_t src_ne = xbt_dict_get_or_null(routing->predecessor_to_index, src); - network_element_t src_ne_AS, dst_ne_AS; - - /* if some network element is a AS, I need to find the adecuate gateway for the route */ - if(!src_ne || !dst_ne ) { - xbt_assert1(routing->AS_to_index, "AS table not found (\"%s\")",rc->name); - AS_table_size = xbt_dict_length(routing->AS_to_index); - src_ne_AS = xbt_dict_get_or_null(routing->AS_to_index, src); - dst_ne_AS = xbt_dict_get_or_null(routing->AS_to_index, dst); - xbt_assert2(src_ne_AS && dst_ne_AS, "Attempt to make a route between a hosts element and a AS (\"%s\",\"%s\")",src,dst); - route_limits_t limits = &TO_FLOYD_AS(src_ne_AS->id,dst_ne_AS->id); - if(!src_ne) routing->last_route->src_gateway = xbt_strdup(limits->src_gateway); - if(!dst_ne) routing->last_route->dst_gateway = xbt_strdup(limits->dst_gateway); - dst_ne = xbt_dict_get_or_null(routing->predecessor_to_index, limits->dst_gateway); - src_ne = xbt_dict_get_or_null(routing->predecessor_to_index, limits->src_gateway); - } - - xbt_assert2(src_ne != NULL || dst_ne != NULL, - "Invalid network elements \"%s\" or \"%s\" not found", src, dst); + int table_size = xbt_dict_length(routing->to_index); - int src_id = src_ne->id; - int dst_id = dst_ne->id; - - int pred = dst_id; + 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); - + pred = TO_FLOYD_PRED(*src_id, pred); if(pred == -1) // if no pred in route -> no route to host - break; - + break; xbt_assert2(TO_FLOYD_LINK(pred,prev_pred),"Invalid link for the route between \"%s\" or \"%s\"", src, dst); - xbt_dynar_unshift(routing->last_route->generic_route.link_list, &(TO_FLOYD_LINK(pred,prev_pred))); - - } 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( xbt_dynar_length(routing->last_route->generic_route.link_list) > 0 ) - return routing->last_route; - else - return NULL; -} - -static xbt_dict_t floyd_get_network_elements(routing_component_t rc, e_surf_network_element_type_t req_type) -{ - routing_component_floyd_t routing = (routing_component_floyd_t)rc; - xbt_dict_t result = xbt_dict_new(); - xbt_dict_cursor_t cursor = NULL; - char *key; - network_element_t ne; - // TODO: do the next (the AS_GATEWAY are definened in the AS in the this_AS) - if(req_type == SURF_NETWORK_ELEMENT_AS_GATEWAY ) { - xbt_assert0(0, "NOT IMPLEMENTED YET"); - } - // TODO: do the next (the links are not defined for the routing) - if(req_type == SURF_NETWORK_ELEMENT_LINK ) { - xbt_assert0(0, "NOT IMPLEMENTED YET"); - } - // TODO: do the next (the routers are defined into predecessor_to_index) - if(req_type == SURF_NETWORK_ELEMENT_ROUTER ) { - xbt_assert0(0, "NOT IMPLEMENTED YET"); - } - - if( req_type == SURF_NETWORK_ELEMENT_NULL || req_type == SURF_NETWORK_ELEMENT_HOST ) { - xbt_dict_foreach(routing->predecessor_to_index, cursor, key, ne) { - if( ne->type == SURF_NETWORK_ELEMENT_HOST) { - e_surf_network_element_type_t *new_type = xbt_new0(e_surf_network_element_type_t,1); - *new_type = ne->type; - xbt_dict_set(result,key,new_type,xbt_free); + 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)) { + routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,gw_dst); + routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,prev_gw_src); + xbt_assert4(src_as==dst_as,"bad routing, differents AS gateways in route \"%s\" to \"%s\" (\"%s\"-\"%s\")",src,dst,gw_dst,prev_gw_src); + route_extended_t e_route_as_to_as = (*(src_as->get_route))(src_as,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->generic_route.link_list; + int pos = 0; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_insert_at(new_e_route->generic_route.link_list,pos,&link); + pos++; } } - } - - if( req_type == SURF_NETWORK_ELEMENT_NULL || req_type == SURF_NETWORK_ELEMENT_AS || req_type == SURF_NETWORK_ELEMENT_GATEWAY ) { - xbt_dict_foreach(routing->predecessor_to_index, cursor, key, ne) { - if( req_type == SURF_NETWORK_ELEMENT_NULL || req_type == ne->type ) { - e_surf_network_element_type_t *new_type = xbt_new0(e_surf_network_element_type_t,1); - *new_type = ne->type; - xbt_dict_set(result,key,new_type,xbt_free); - } + + 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 result; + + 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,AS_table_size; + 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); - xbt_dict_free(&(routing->predecessor_to_index)); - xbt_free(routing->link_table); - /* Delete dictionary index and limit table */ - if(routing->AS_to_index) { - AS_table_size = xbt_dict_length(routing->AS_to_index); - xbt_dict_free(&(routing->AS_to_index)); - } - if(routing->AS_table) { - for(i=0;iAS_table); - /* Delete index dynar for last routes */ - if(routing->last_route->src_gateway) xbt_free(routing->last_route->src_gateway); - if(routing->last_route->dst_gateway) xbt_free(routing->last_route->dst_gateway); - xbt_dynar_free(&(routing->last_route->generic_route.link_list)); - xbt_free(routing->last_route); /* Delete structure */ xbt_free(rc); } } -/* Creation routing model functions */ - -static void* model_floyd_create() { +static void* model_floyd_create(void) { routing_component_floyd_t new_component = xbt_new0(s_routing_component_floyd_t,1); - /* global vars */ + 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->generic_routing.get_network_elements = floyd_get_network_elements; - /* local vars */ - new_component->last_route = xbt_new(s_route_extended_t,1); - new_component->last_route->src_gateway = NULL; - new_component->last_route->dst_gateway = NULL; - new_component->last_route->generic_route.link_list = xbt_dynar_new(global_routing->size_of_link,NULL); - new_component->predecessor_to_index = xbt_dict_new(); - new_component->AS_to_index = NULL; - new_component->AS_table = NULL; + 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() { - surfxml_add_callback(STag_surfxml_host_cb_list, &floyd_parse_S_host); - surfxml_add_callback(STag_surfxml_gateway_cb_list, &floyd_parse_S_gateway); - surfxml_add_callback(STag_surfxml_router_cb_list, &floyd_parse_S_router); - surfxml_add_callback(ETag_surfxml_link_c_ctn_cb_list, &generic_E_link_c_ctn_new_elem); - surfxml_add_callback(STag_surfxml_route_cb_list, &generic_parse_S_route_new_and_endpoints); - surfxml_add_callback(ETag_surfxml_route_cb_list, &generic_parse_E_route_store_route); +static void model_floyd_load(void) { + /* use "surfxml_add_callback" to add a parse function call */ } -static void model_floyd_unload() { - surfxml_del_callback(&STag_surfxml_host_cb_list, &floyd_parse_S_host); - surfxml_del_callback(&STag_surfxml_gateway_cb_list, &floyd_parse_S_gateway); - surfxml_del_callback(&STag_surfxml_router_cb_list, &floyd_parse_S_router); - surfxml_del_callback(&ETag_surfxml_link_c_ctn_cb_list, &generic_E_link_c_ctn_new_elem); - surfxml_del_callback(&STag_surfxml_route_cb_list, &generic_parse_S_route_new_and_endpoints); - surfxml_del_callback(&ETag_surfxml_route_cb_list, &generic_parse_E_route_store_route); +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); - const char *sep = "#"; - char *key, *key_gw, *link_name, *keyX, *keyY; - char *src_name, *dst_name, *src_gw_name, *dst_gw_name; + xbt_dict_cursor_t cursor = NULL; double * cost_table; - unsigned int i,j; - unsigned int a,b,c; - int host_count=0, AS_count=0; - void *data = NULL; - void *link = NULL; - e_surf_network_element_type_t *type_gw; - network_element_t ne, new_ne, src_ne, dst_ne, src_gw_ne, dst_gw_ne, neX, neY; - xbt_dict_cursor_t cursor=NULL, cursor_gw=NULL, cursorX=NULL, cursorY=NULL; - xbt_dynar_t links, keys; - routing_component_t component; - - /* (0) Check for if there are any host in the a AS */ - xbt_dict_foreach(routing->predecessor_to_index, cursor, key, ne) { - if(ne->type == SURF_NETWORK_ELEMENT_HOST ) host_count++; - } - AS_count = xbt_dict_length(current_routing->routing_sons); - - xbt_assert2( (host_count>0 && AS_count==0) || (host_count==0 && AS_count>0), - "Invalid count of network elements, %d AS and %d host found",AS_count,host_count); - - /* Add the AS gateways to network elements dictionary */ - xbt_dict_foreach(current_routing->routing_sons, cursor, key, component) { - xbt_assert1(component->get_network_elements, - "Invalid \"get_network_elements\" for \"%s\"",key); - xbt_dict_t gateways = (*(component->get_network_elements))(component,SURF_NETWORK_ELEMENT_GATEWAY); - xbt_dict_foreach(gateways, cursor_gw, key_gw, type_gw) { - new_ne = xbt_new0(s_network_element_t,1); - new_ne->id = xbt_dict_length(routing->predecessor_to_index); - new_ne->type = SURF_NETWORK_ELEMENT_AS_GATEWAY; - xbt_dict_set(routing->predecessor_to_index,key_gw,new_ne,xbt_free); - } - xbt_dict_free(&gateways); - } - - /* (1) first process: calculate the routing table using the floyd algorithm */ + char *key,*data, *end; //*src_name, *dst_name; + 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->predecessor_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(void*,table_size*table_size); // actual link between src and dst - - /* Initialize costs and predecessors */ - for(i=0;ito_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) { - - links = (xbt_dynar_t)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_gw_name = xbt_dynar_get_as(keys, 2, char*); - dst_gw_name = xbt_dynar_get_as(keys, 3, char*); - - src_ne = xbt_dict_get_or_null(routing->predecessor_to_index, src_name); - dst_ne = xbt_dict_get_or_null(routing->predecessor_to_index, dst_name); - src_gw_ne = xbt_dict_get_or_null(routing->predecessor_to_index, src_gw_name); - dst_gw_ne = xbt_dict_get_or_null(routing->predecessor_to_index, dst_gw_name); - - xbt_assert2(src_ne != NULL || src_gw_ne != NULL, - "Invalid source, network elements\"%s\" with gateway \"%s\" not found", src_name, src_gw_name); - xbt_assert2(dst_ne != NULL || dst_gw_ne != NULL, - "Invalid source, network elements\"%s\" with gateway \"%s\" not found", dst_name, dst_gw_name); - - //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 \"%s\" and \"%s\", should be 1", xbt_dynar_length(links), src_name, dst_name); - - link_name = xbt_dynar_getfirst_as(links, char*); - link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); - - if( src_ne == NULL ) src_ne = src_gw_ne; - if( dst_ne == NULL ) dst_ne = dst_gw_ne; - - if (link) - link_list = link; - else - THROW1(mismatch_error,0,"Link %s not found", link_name); - - TO_FLOYD_LINK(src_ne->id,dst_ne->id) = link_list; - TO_FLOYD_PRED(src_ne->id,dst_ne->id) = src_ne->id; - + src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 16); + dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); + 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; //link cost - TO_FLOYD_COST(src_ne->id,dst_ne->id) = 1; // assume 1 for now - + TO_FLOYD_COST(src_id,dst_id) = 1; // assume 1 for now // TODO DAVID REDO xbt_dynar_free(&keys); } /* Add the loopback if needed */ - for (i = 0; i < table_size; i++) - if (TO_FLOYD_PRED(i,i) == -1) { // TODO: FIXED DAVID - TO_FLOYD_PRED(i,i) = i; - TO_FLOYD_COST(i,i) = 1; - TO_FLOYD_LINK(i,i) = global_routing->loopback; + 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) { // && !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_FLOYD_LINK(i,i) = e_route; + TO_FLOYD_PRED(i,i) = i; + TO_FLOYD_COST(i,i) = 1; + } } - - /* Calculate path costs */ + } + //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); + } - /* (2) second process: if there are any AS, make a routing table for AS limits */ + /* delete parse dict */ + xbt_dict_free(&(routing->parse_routes)); - if( xbt_dict_length(current_routing->routing_sons) > 0 ) { + //cleanup + xbt_free(cost_table); +} - /* store index for the routing table */ - routing->AS_to_index = xbt_dict_new(); +/* ************************************************************************** */ +/* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ - /* Add all local AS into AS_to_index */ - xbt_dict_foreach(current_routing->routing_sons, cursor, key, component) { - ne = xbt_new0(s_network_element_t,1); - ne->id = xbt_dict_length(routing->AS_to_index); - ne->type = SURF_NETWORK_ELEMENT_AS; - xbt_dict_set(routing->AS_to_index,key,ne,xbt_free); +typedef struct { + s_routing_component_t generic_routing; + 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; + + +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) { + xbt_free(elm->pred_arr); + xbt_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) { + xbt_free(elm); + } +} + +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); + } +} + +/* Utility functions */ + +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; + + data = xbt_new0(struct graph_node_data, 1); // FIXED by david + 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); // FIXED by david + 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); } - - /* Add all local gateways into AS_to_index */ - xbt_dict_foreach(routing->predecessor_to_index, cursor, key, ne) { - if( ne->type == SURF_NETWORK_ELEMENT_GATEWAY ) { - new_ne = xbt_new0(s_network_element_t,1); - new_ne->id = xbt_dict_length(routing->AS_to_index); - new_ne->type = SURF_NETWORK_ELEMENT_GATEWAY; - xbt_dict_set(routing->AS_to_index,key,new_ne,xbt_free); - } + if(dst == NULL) { + dst = route_graph_new_node(rc,dst_id, -1); } + } - /* size of the limits table for AS */ - int AS_table_size = xbt_dict_length(routing->AS_to_index); - - /* Create the limits table for AS */ - routing->AS_table = xbt_new0(s_route_limits_t, AS_table_size * AS_table_size); - for (i=0;iroute_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; } } - /* (3) third process: find the best gateways for each AS */ + 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); + } + } +} - // select two AS or gateways - xbt_dict_foreach(routing->AS_to_index, cursorX, keyX, neX) { - xbt_dict_foreach(routing->AS_to_index, cursorY, keyY, neY) { +/* Business methods */ - if( neX != neY ) { // if the network elements are differents +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 by david + 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); - if( ( neX->type==SURF_NETWORK_ELEMENT_HOST || neX->type==SURF_NETWORK_ELEMENT_GATEWAY ) && - ( neY->type==SURF_NETWORK_ELEMENT_HOST || neY->type==SURF_NETWORK_ELEMENT_GATEWAY ) ) { - /* route between hosts or gateways : do not any thing */ - } else if( (neX->type==SURF_NETWORK_ELEMENT_AS && neY->type==SURF_NETWORK_ELEMENT_AS) || - (neX->type==SURF_NETWORK_ELEMENT_AS && neY->type==SURF_NETWORK_ELEMENT_GATEWAY) || - (neX->type==SURF_NETWORK_ELEMENT_GATEWAY && neY->type==SURF_NETWORK_ELEMENT_AS) ) { - /* route between AS */ - /* or route between AS and gateway */ - /* or route between gateway adn AS */ - - routing_component_t rcX, rcY; - xbt_dict_t list_ASgatewayX, list_ASgatewayY; - - if( neX->type==SURF_NETWORK_ELEMENT_AS ) { - rcX = xbt_dict_get_or_null(current_routing->routing_sons,keyX); - xbt_assert1(rcX && rcX->get_network_elements, - "Invalid \"get_network_elements\" for \"%s\"",keyX); - list_ASgatewayX = (*(rcX->get_network_elements))(rcX,SURF_NETWORK_ELEMENT_GATEWAY); - } else { - list_ASgatewayX = xbt_dict_new(); - e_surf_network_element_type_t *new_type = xbt_new0(e_surf_network_element_type_t,1); - *new_type = SURF_NETWORK_ELEMENT_GATEWAY; - xbt_dict_set(list_ASgatewayX,keyX,new_type,xbt_free); - } - - if( neY->type==SURF_NETWORK_ELEMENT_AS ) { - rcY = xbt_dict_get_or_null(current_routing->routing_sons,keyY); - xbt_assert1(rcY && rcY->get_network_elements, - "Invalid \"get_network_elements\" for \"%s\"",keyY); - list_ASgatewayY = (*(rcY->get_network_elements))(rcY,SURF_NETWORK_ELEMENT_GATEWAY); - } else { - list_ASgatewayY = xbt_dict_new(); - e_surf_network_element_type_t *new_type = xbt_new0(e_surf_network_element_type_t,1); - *new_type = SURF_NETWORK_ELEMENT_GATEWAY; - xbt_dict_set(list_ASgatewayY,keyY,new_type,xbt_free); - } - - xbt_dict_cursor_t cursorASgatewayX=NULL, cursorASgatewayY=NULL; - char * keyASgatewayX, *keyASgatewayY; - e_surf_network_element_type_t *typeASgatewayX, *typeASgatewayY; - - char* best_ASgatewayX = NULL; - char* best_ASgatewayY = NULL; - double best_cost = DBL_MAX; - - // test for all combinations fo Gateways between the AS - xbt_dict_foreach(list_ASgatewayX, cursorASgatewayX, keyASgatewayX, typeASgatewayX) { - xbt_dict_foreach(list_ASgatewayY, cursorASgatewayY, keyASgatewayY, typeASgatewayY) { - //printf(".....%s....%s....\n",keyASgatewayX,keyASgatewayY); - network_element_t src_ne = xbt_dict_get_or_null(routing->predecessor_to_index, keyASgatewayX); - network_element_t dst_ne = xbt_dict_get_or_null(routing->predecessor_to_index, keyASgatewayY); - double new_cost = TO_FLOYD_COST(src_ne->id,dst_ne->id); - if( best_cost > new_cost ) { - if(best_ASgatewayX) xbt_free(best_ASgatewayX); - if(best_ASgatewayY) xbt_free(best_ASgatewayY); - best_cost = new_cost; - best_ASgatewayX = xbt_strdup(keyASgatewayX); - best_ASgatewayY = xbt_strdup(keyASgatewayY); - } - } - } - // store the best combination of gateways into the table - xbt_assert2(best_ASgatewayX && best_ASgatewayY, - "Can not found a combination of gateways for a route between \"%s\" and \"%s\"",keyX,keyY); - network_element_t src_ne = xbt_dict_get_or_null(routing->AS_to_index, keyX); - network_element_t dst_ne = xbt_dict_get_or_null(routing->AS_to_index, keyY); - xbt_assert0(src_ne && dst_ne, "Invalid gateways for a make a route"); - TO_FLOYD_AS(src_ne->id,dst_ne->id).src_gateway = best_ASgatewayX; - TO_FLOYD_AS(src_ne->id,dst_ne->id).dst_gateway = best_ASgatewayY; - - /* free the list of gateways */ - xbt_dict_free(&list_ASgatewayX); - xbt_dict_free(&list_ASgatewayY); - - } else { - xbt_assert0(0, "Invalid network element type"); - } - } // close big if - } // close Y foreach - } // close X foreach + 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); - } // close if for second process + // TODO: correct the order + links = e_route->generic_route.link_list; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_push(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; + int cost_v_u = 1; //fixed link cost for now // TODO DAVID REDO + + 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); - /* delete the parse table */ - xbt_dict_foreach(routing->parse_routes, cursor, key, links) { - xbt_dynar_free(&links); } - /* delete all the parsing temporary data */ - xbt_dict_free(&(routing->parse_routes)); + //compose route path with links + char *gw_src,*gw_dst, *prev_gw_src,*prev_gw_dst, *first_gw; - /* cleanup */ - free(cost_table); -} + 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); -/* ************************************************************************** */ -/* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ + 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)) { + routing_component_t src_as = xbt_dict_get_or_null(global_routing->where_network_elements,gw_dst); + routing_component_t dst_as = xbt_dict_get_or_null(global_routing->where_network_elements,prev_gw_src); + xbt_assert4(src_as==dst_as,"bad routing, differents AS gateways in route \"%s\" to \"%s\" (\"%s\"-\"%s\")",src,dst,gw_dst,prev_gw_src); + route_extended_t e_route_as_to_as = (*(src_as->get_route))(src_as,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->generic_route.link_list; + int pos = 0; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_insert_at(new_e_route->generic_route.link_list,pos,&link); + pos++; + } + xbt_dynar_free(&(e_route_as_to_as->generic_route.link_list)); + xbt_free(e_route_as_to_as); + } + + 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++; + } -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; - int cached; -} s_routing_component_dijkstra_t,*routing_component_dijkstra_t; + if(rc->hierarchy == SURF_ROUTING_RECURSIVE) { + new_e_route->src_gateway = gw_src; + new_e_route->dst_gateway = first_gw; + } -/* Parse routing model functions */ + if(routing->cached && elm == NULL) { + //add to predecessor list of the current src-host to cache + elm = xbt_new0(struct route_cache_element, 1); // FIXED by david + 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); + } -/* Business methods */ + if(!routing->cached) + xbt_free(pred_arr); + + return new_e_route; +} -/* Creation routing model functions */ +static void dijkstra_finalize(routing_component_t rc) { + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; -static void* model_dijkstra_create() { - return NULL; + 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); + } } -static void model_dijkstra_load() { -} +/* Creation routing model functions */ -static void model_dijkstra_unload() { +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_end() { +static void* model_dijkstra_create(void) { + return model_dijkstra_both_create(0); } -static void* model_dijkstracache_create() { - return NULL; +static void* model_dijkstracache_create(void) { + return model_dijkstra_both_create(1); } -static void model_dijkstracache_load() { +static void model_dijkstra_both_load(void) { + /* use "surfxml_add_callback" to add a parse function call */ } -static void model_dijkstracache_unload() { +static void model_dijkstra_both_unload(void) { + /* use "surfxml_del_callback" to remove a parse function call */ } -static void model_dijkstracache_end() { -} +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, 16); + dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 16); + 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 ******************************* */ @@ -1324,21 +1460,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 **************** */ @@ -1347,65 +1495,422 @@ 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 */ +/*** 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() {return NULL;} /* mandatory */ -static void model_NEW_load() {} /* mandatory */ -static void model_NEW_unload() {} /* mandatory */ -static void model_NEW_end() {} /* mandatory */ +// /*** 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 */ /* ************************************************************************** */ /* ************************* GENERIC PARSE FUNCTIONS ************************ */ -static void generic_parse_S_route_new_and_endpoints(void) { - 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; - gw_src = A_surfxml_route_gw_src; - gw_dst = A_surfxml_route_gw_dst; - link_list = xbt_dynar_new(sizeof(char*), &xbt_free_ref); +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_malloc(sizeof(int)); ? + 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); } -static void generic_E_link_c_ctn_new_elem(void) { - char *val; - val = xbt_strdup(A_surfxml_link_c_ctn_id); - xbt_dynar_push(link_list, &val); +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_malloc(sizeof(int)); ? + 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); } -static void generic_parse_E_route_store_route(void) { +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; - xbt_dict_t parse_routes; - if( current_routing->routing == &(routing_models[SURF_MODEL_FULL]) ) - parse_routes = ((routing_component_full_t)current_routing)->parse_routes; - else if( current_routing->routing == &(routing_models[SURF_MODEL_FLOYD]) ) - parse_routes = ((routing_component_floyd_t)current_routing)->parse_routes; - else - xbt_assert0(0, "Invalid model for call \"generic_parse_E_route_store_route\""); - route_name = bprintf("%s#%s#%s#%s",src,dst,gw_src,gw_dst); - xbt_assert2(xbt_dynar_length(link_list)>0, "Invalid count of links, must be greater than zero (%s,%s)",src,dst); - xbt_assert3(!xbt_dict_get_or_null(parse_routes,route_name), - "The route between \"%s\" and \"%s\" already exist (\"%s\")",src,dst,route_name); - xbt_dict_set(parse_routes, route_name, link_list, NULL); - free(route_name); - src = NULL; - dst = NULL; - link_list = NULL; + 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); +} + +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); +} + +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); + } + + int max_index_src = (path_src->used)-1; + int max_index_dst = (path_dst->used)-1; + + 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); + } + 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); + + 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; +} + +/* ************************************************************************** */ +/* ************************* GENERIC AUX FUNCTIONS ************************** */ + +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; + + 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); + } + + return new_e_route; +} + +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); + } +} + +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 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); +} + +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); +} + //////////////////////////////////////////////////////////////////////////////// // HERE FINISH THE NEW CODE //////////////////////////////////////////////////////////////////////////////// @@ -1420,8 +1925,8 @@ static void print_tree(routing_component_t rc) { 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); } } + { xbt_dict_foreach(((routing_component_floyd_t)rc)->to_index, cursor, key, val) { printf("<%s-%d> ",key,*val); } + } else xbt_assert0(0, "Invalid model for call \"print_tree\""); printf("\n"); @@ -1438,46 +1943,47 @@ 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); - } + xbt_dict_foreach(global_routing->where_network_elements, cursor, key, elem) { printf("<%s>\n",key); } } //...... 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 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); } //...... DEBUG ONLY .... // -static void DEGUB_exit(void) { +static void DEBUG_exit(void) { - printf("-------- print tree elements -----\n"); - print_tree(global_routing->root); - printf("----------------------------------\n\n"); - - printf("-------- network_elements --------\n"); - print_global(); - printf("----------------------------------\n\n"); +// 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"}; +// const 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"}; +// const char* names[] = { "11.A","11.B","11.C"}; // int i,j,total = 3; -// char* names[] = { "141.A","141.B","143.A","143.B"}; +// const char* names[] = { "141.A","141.B","143.A","143.B"}; // int i,j,total = 4; -// char* names[] = { "142.A","142.B","142.C" }; +// const char* names[] = { "15.A","15.B","15.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"}; +// const 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[] = { "142.A","142.B","142.C" }; +// int i,j,total = 3; + const char* names[] = { "11.A","11.B","11.C", "121.A","121.B", "122.A", @@ -1488,13 +1994,56 @@ static void DEGUB_exit(void) { "15.A","15.B","15.C"}; unsigned int i,j,total = 3+2+1+2+2+3+2+3; +// const char* names[] = { "141.A","143.A" }; +// int i,j,total = 2; + printf("-- print all the example routes --\n"); xbt_dynar_t links; void* link; for(i=0;i>>\n ",names[i],names[j]); links = (*(global_routing->get_route))(names[i],names[j]); - printf("route from %s to %s >>> ",names[i],names[j]); + printf(">>>"); + unsigned int cpt=0; + xbt_dynar_foreach(links, cpt, link) { + s_surf_resource_t* generic_resource = link; + printf(" %s",generic_resource->name); + } + printf("\n"); + } + } + for(i=0;i>>\n ",names[i],names[j]); + links = (*(global_routing->get_route))(names[i],names[j]); + printf(">>>"); + unsigned int cpt=0; + xbt_dynar_foreach(links, cpt, link) { + s_surf_resource_t* generic_resource = link; + printf(" %s",generic_resource->name); + } + printf("\n"); + } + } + for(i=0;i>>\n ",names[i],names[j]); + links = (*(global_routing->get_route))(names[i],names[j]); + printf(">>>"); + unsigned int cpt=0; + xbt_dynar_foreach(links, cpt, link) { + s_surf_resource_t* generic_resource = link; + printf(" %s",generic_resource->name); + } + printf("\n"); + } + } + for(i=0;i>>\n ",names[i],names[j]); + links = (*(global_routing->get_route))(names[i],names[j]); + printf(">>>"); unsigned int cpt=0; xbt_dynar_foreach(links, cpt, link) { s_surf_resource_t* generic_resource = link; @@ -1503,20 +2052,20 @@ static void DEGUB_exit(void) { printf("\n"); } } - printf("----------------------------------\n\n"); printf("---------- call finalize ---------\n"); (*(global_routing->finalize))(); printf("----------------------------------\n"); - //exit(0); + exit(0); } //////////////////////////////////////////////////////////////////////////////// // HERE END THE NEW CODE //////////////////////////////////////////////////////////////////////////////// + // /* ************************************************************************** */ // /* *************************** FULL ROUTING ********************************* */ // typedef struct {