X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c956954c1fd024c0f7ee2b015827a7b4e33fe72..d7e241de6a9ff3a5fa5866fb535787f12341655a:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 0330b295b4..8e68cf3cd3 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -10,7 +10,7 @@ #include "gras_config.h" #ifdef HAVE_PCRE_LIB -#include /* regular expresion library */ +#include /* regular expression library */ #endif #include "surf_private.h" #include "xbt/dynar.h" @@ -18,6 +18,10 @@ #include "xbt/config.h" #include "xbt/graph.h" #include "xbt/set.h" +#include "surf/surfxml_parse.h" + +xbt_dict_t patterns = NULL; +xbt_dict_t random_value = NULL; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); @@ -25,13 +29,14 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); routing_global_t global_routing = NULL; routing_component_t current_routing = NULL; model_type_t current_routing_model = NULL; +static double_f_cpvoid_t get_link_latency = NULL; /* Prototypes of each model */ static void *model_full_create(void); /* create structures for full routing model */ static void model_full_load(void); /* load parse functions for full routing model */ static void model_full_unload(void); /* unload parse functions for full routing model */ static void model_full_end(void); /* finalize the creation of full routing model */ -static void model_full_set_route( /* Set the route and ASroute between src and dst */ +static void model_full_set_route( /* Set the route and ASroute between src and dst */ routing_component_t rc, const char *src, const char *dst, name_route_extended_t route); static void *model_floyd_create(void); /* create structures for floyd routing model */ @@ -51,19 +56,25 @@ static void model_dijkstra_both_set_route (routing_component_t rc, const char *s const char *dst, name_route_extended_t route); static void *model_rulebased_create(void); /* create structures for rulebased routing model */ -static void model_rulebased_load(void); /* load parse functions for rulebased routing model */ +static void model_rulebased_load(void); /* load parse functions for rulebased routing model */ static void model_rulebased_unload(void); /* unload parse functions for rulebased routing model */ -static void model_rulebased_end(void); /* finalize the creation of rulebased routing model */ +static void model_rulebased_end(void); /* finalize the creation of rulebased routing model */ + +static void *model_none_create(void); /* none routing model */ +static void model_none_load(void); /* none routing model */ +static void model_none_unload(void); /* none routing model */ +static void model_none_end(void); /* none routing model */ -static void *model_none_create(void); /* none routing model */ -static void model_none_load(void); /* none routing model */ -static void model_none_unload(void); /* none routing model */ -static void model_none_end(void); /* none routing model */ +static void routing_parse_Scluster(void); /* cluster bypass */ +static void routing_parse_Speer(void); /* peer bypass */ +static void routing_parse_Srandom(void); /* random bypass */ +static void routing_parse_Erandom(void); /* random bypass */ -static void routing_parse_Scluster(void); /*cluster bypass */ +static void routing_parse_Sconfig(void); /* config Tag */ +static void routing_parse_Econfig(void); /* config Tag */ -static void routing_parse_Sconfig(void); /*config Tag */ -static void routing_parse_Econfig(void); /*config Tag */ +static char* replace_random_parameter(char * chaine); +static void clean_dict_random(void); /* this lines are only for replace use like index in the model table */ typedef enum { @@ -78,7 +89,7 @@ typedef enum { } e_routing_types; -/* must be finish with null and carefull if change de order */ +/* must finish with NULL and be careful if the order is changed */ struct s_model_type routing_models[] = { {"Full", "Full routing data (fast, large memory requirements, fully expressive)", model_full_create, @@ -102,6 +113,8 @@ struct s_model_type routing_models[] = { {"Full", #ifdef HAVE_PCRE_LIB {"RuleBased", "Rule-Based routing data (...)", model_rulebased_create, model_rulebased_load, model_rulebased_unload, model_rulebased_end}, +{"Vivaldi", "Vivaldi routing", model_rulebased_create, + model_rulebased_load, model_rulebased_unload, model_rulebased_end}, #endif {NULL, NULL, NULL, NULL, NULL, NULL} }; @@ -113,10 +126,6 @@ static void generic_set_processing_unit(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, name_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); @@ -127,6 +136,7 @@ static int surf_pointer_resource_cmp(const void *a, const void *b); /* ************************************************************************** */ /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */ +static double generic_get_link_latency(routing_component_t rc, const char *src, const char *dst); static xbt_dynar_t generic_get_onelink_routes(routing_component_t rc); static route_extended_t generic_get_bypassroute(routing_component_t rc, const char *src, @@ -138,6 +148,9 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void *data, int order); +static route_t +generic_new_route(e_surf_routing_hierarchy_t hierarchy, + void *data, int order); static void generic_free_route(route_t route); static void generic_free_extended_route(route_extended_t e_route); static routing_component_t @@ -151,32 +164,80 @@ static void generic_src_dst_check(routing_component_t rc, const char *src, /* **************************** 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 const char *src = NULL; /* temporary store the source name of a route */ +static const 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 double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) +{ + double src_coord, dst_coord; + + src_coord = atof(xbt_dynar_get_as(src, index, char *)); + dst_coord = atof(xbt_dynar_get_as(dst, index, char *)); + + return (src_coord-dst_coord)*(src_coord-dst_coord); + +} + +static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst) +{ + double euclidean_dist; + xbt_dynar_t src_ctn, dst_ctn; + src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL); + if(!src_ctn) src_ctn = xbt_lib_get_or_null(as_router_lib, src, COORD_ASR_LEVEL); + dst_ctn = xbt_lib_get_or_null(host_lib, dst, COORD_HOST_LEVEL); + if(!dst_ctn) dst_ctn = xbt_lib_get_or_null(as_router_lib, dst, COORD_ASR_LEVEL); + + if(dst_ctn == NULL || src_ctn == NULL) + xbt_die("Coord src '%s' :%p dst '%s' :%p",src,src_ctn,dst,dst_ctn); + + euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn)) + +fabs(atof(xbt_dynar_get_as(src_ctn, 2, char *)))+fabs(atof(xbt_dynar_get_as(dst_ctn, 2, char *))); + + xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist); + + return euclidean_dist; +} + /** * \brief Add a "host" to the network element list */ -static void parse_S_host(char *host_id) +static void parse_S_host(const char *host_id, const char* coord) { network_element_info_t info = NULL; 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, host_id), - "Reading a host, processing unit \"%s\" already exist", + xbt_assert(!xbt_lib_get_or_null(host_lib, host_id,ROUTING_HOST_LEVEL), + "Reading a host, processing unit \"%s\" already exists", host_id); - xbt_assert1(current_routing->set_processing_unit, + xbt_assert(current_routing->set_processing_unit, "no defined method \"set_processing_unit\" in \"%s\"", current_routing->name); (*(current_routing->set_processing_unit)) (current_routing, host_id); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_HOST; - xbt_dict_set(global_routing->where_network_elements, host_id, - (void *) info, NULL); + xbt_lib_set(host_lib,host_id,ROUTING_HOST_LEVEL,(void *) info); + if (strcmp(coord,"")) { + if(!COORD_HOST_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); + xbt_dynar_t ctn = xbt_str_split_str(coord, " "); + xbt_dynar_shrink(ctn, 0); + xbt_lib_set(host_lib,host_id,COORD_HOST_LEVEL,(void *) ctn); + } +} + +static void parse_E_host(void) +{ + xbt_dict_cursor_t cursor = NULL; + char *key; + char *elem; + + xbt_dict_foreach(current_property_set, cursor, key, elem) { + XBT_DEBUG("property : %s = %s",key,elem); + } } /* @@ -184,65 +245,86 @@ static void parse_S_host(char *host_id) */ static void parse_S_host_XML(void) { - parse_S_host(A_surfxml_host_id); + parse_S_host(A_surfxml_host_id, A_surfxml_host_coordinates); +} +static void parse_E_host_XML(void) +{ + parse_E_host(); } /* * \brief Add a host to the network element list from lua script */ -static void parse_S_host_lua(char *host_id) +static void parse_S_host_lua(const char *host_id, const char *coord) { - parse_S_host(host_id); + parse_S_host(host_id, coord); } /** * \brief Add a "router" to the network element list */ -static void parse_S_router(void) +static void parse_S_router(const char *router_id) { network_element_info_t info = NULL; if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_BASE; - xbt_assert1(!xbt_dict_get_or_null - (global_routing->where_network_elements, - A_surfxml_router_id), - "Reading a router, processing unit \"%s\" already exist", - A_surfxml_router_id); - xbt_assert1(current_routing->set_processing_unit, + xbt_assert(!xbt_lib_get_or_null(as_router_lib,A_surfxml_router_id, ROUTING_ASR_LEVEL), + "Reading a router, processing unit \"%s\" already exists", + router_id); + xbt_assert(current_routing->set_processing_unit, "no defined method \"set_processing_unit\" in \"%s\"", current_routing->name); (*(current_routing->set_processing_unit)) (current_routing, - A_surfxml_router_id); + router_id); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; - xbt_dict_set(global_routing->where_network_elements, A_surfxml_router_id, - (void *) info, NULL); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(A_surfxml_router_id, 0); -#endif + + xbt_lib_set(as_router_lib,router_id,ROUTING_ASR_LEVEL,(void *) info); + if (strcmp(A_surfxml_router_coordinates,"")) { + if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); + xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " "); + xbt_dynar_shrink(ctn, 0); + xbt_lib_set(as_router_lib,router_id,COORD_ASR_LEVEL,(void *) ctn); + } +} + +/** + * brief Add a "router" to the network element list from XML description + */ +static void parse_S_router_XML(void) +{ + return parse_S_router(A_surfxml_router_id); +} + +/** + * brief Add a "router" to the network element list from XML description + */ +static void parse_S_router_lua(const char* router_id) +{ + return parse_S_router(router_id); } /** * \brief Set the endponints for a route */ -static void parse_S_route_new_and_endpoints(char *src_id, char *dst_id) +static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id) { if (src != NULL && dst != NULL && link_list != NULL) - THROW2(arg_error, 0, "Route between %s to %s can not be defined", + THROWF(arg_error, 0, "Route between %s to %s can not be defined", src_id, dst_id); src = src_id; dst = dst_id; - xbt_assert2(strlen(src) > 0 || strlen(dst) > 0, + xbt_assert(strlen(src) > 0 || strlen(dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } /** - * \breif Set the endpoints for a route from XML + * \brief Set the endpoints for a route from XML */ static void parse_S_route_new_and_endpoints_XML(void) { @@ -251,9 +333,9 @@ static void parse_S_route_new_and_endpoints_XML(void) } /** - * \breif Set the endpoints for a route from lua + * \brief Set the endpoints for a route from lua */ -static void parse_S_route_new_and_endpoints_lua(char *id_src, char *id_dst) +static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst) { parse_S_route_new_and_endpoints(id_src, id_dst); } @@ -264,13 +346,13 @@ static void parse_S_route_new_and_endpoints_lua(char *id_src, char *id_dst) 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", + THROWF(arg_error, 0, "Route between %s to %s can not be defined", A_surfxml_ASroute_src, A_surfxml_ASroute_dst); src = A_surfxml_ASroute_src; dst = A_surfxml_ASroute_dst; gw_src = A_surfxml_ASroute_gw_src; gw_dst = A_surfxml_ASroute_gw_dst; - xbt_assert2(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); @@ -283,14 +365,14 @@ static void parse_S_ASroute_new_and_endpoints(void) static void parse_S_bypassRoute_new_and_endpoints(void) { if (src != NULL && dst != NULL && link_list != NULL) - THROW2(arg_error, 0, + THROWF(arg_error, 0, "Bypass Route between %s to %s can not be defined", A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst); src = A_surfxml_bypassRoute_src; dst = A_surfxml_bypassRoute_dst; gw_src = A_surfxml_bypassRoute_gw_src; gw_dst = A_surfxml_bypassRoute_gw_dst; - xbt_assert2(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); @@ -300,7 +382,7 @@ static void parse_S_bypassRoute_new_and_endpoints(void) /** * \brief Set a new link on the actual list of link for a route or ASroute */ -static void parse_E_link_ctn_new_elem(char *link_id) +static void parse_E_link_ctn_new_elem(const char *link_id) { char *val; val = xbt_strdup(link_id); @@ -313,18 +395,24 @@ static void parse_E_link_ctn_new_elem(char *link_id) static void parse_E_link_ctn_new_elem_XML(void) { - if( A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_NONE) - parse_E_link_ctn_new_elem(A_surfxml_link_ctn_id); - if( A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_UP) - parse_E_link_ctn_new_elem(bprintf("%s_UP",A_surfxml_link_ctn_id)); - if( A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_DOWN) - parse_E_link_ctn_new_elem(bprintf("%s_DOWN",A_surfxml_link_ctn_id)); + if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_NONE) + parse_E_link_ctn_new_elem(A_surfxml_link_ctn_id); + if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_UP) { + char *link_id = bprintf("%s_UP", A_surfxml_link_ctn_id); + parse_E_link_ctn_new_elem(link_id); + free(link_id); + } + if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_DOWN) { + char *link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_id); + parse_E_link_ctn_new_elem(link_id); + free(link_id); + } } /** * \brief Set a new link on the actual list of link for a route or ASroute from lua */ -static void parse_E_link_c_ctn_new_elem_lua(char *link_id) +static void parse_E_link_c_ctn_new_elem_lua(const char *link_id) { parse_E_link_ctn_new_elem(link_id); } @@ -336,7 +424,7 @@ static void parse_E_route_store_route(void) { name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1); route->generic_route.link_list = link_list; - xbt_assert1(current_routing->set_route, + xbt_assert(current_routing->set_route, "no defined method \"set_route\" in \"%s\"", current_routing->name); (*(current_routing->set_route)) (current_routing, src, dst, route); @@ -354,7 +442,7 @@ static void parse_E_ASroute_store_route(void) e_route->generic_route.link_list = link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); - xbt_assert1(current_routing->set_ASroute, + xbt_assert(current_routing->set_ASroute, "no defined method \"set_ASroute\" in \"%s\"", current_routing->name); (*(current_routing->set_ASroute)) (current_routing, src, dst, e_route); @@ -374,7 +462,7 @@ static void parse_E_bypassRoute_store_route(void) e_route->generic_route.link_list = link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); - xbt_assert1(current_routing->set_bypassroute, + xbt_assert(current_routing->set_bypassroute, "no defined method \"set_bypassroute\" in \"%s\"", current_routing->name); (*(current_routing->set_bypassroute)) (current_routing, src, dst, @@ -420,6 +508,10 @@ static void parse_S_AS(char *AS_id, char *AS_routing) new_routing->name = xbt_strdup(AS_id); new_routing->routing_sons = xbt_dict_new(); + /* Hack for Vivaldi */ + if(!strcmp(model->name,"Vivaldi")) + new_routing->get_latency = vivaldi_get_link_latency; + if (current_routing == NULL && global_routing->root == NULL) { /* it is the first one */ @@ -428,9 +520,9 @@ static void parse_S_AS(char *AS_id, char *AS_routing) } else if (current_routing != NULL && global_routing->root != NULL) { - xbt_assert1(!xbt_dict_get_or_null + xbt_assert(!xbt_dict_get_or_null (current_routing->routing_sons, AS_id), - "The AS \"%s\" already exist", AS_id); + "The AS \"%s\" already exists", AS_id); /* it is a part of the tree */ new_routing->routing_father = current_routing; /* set the father behavior */ @@ -445,7 +537,7 @@ static void parse_S_AS(char *AS_id, char *AS_routing) (*(current_routing->routing->unload)) (); } else { - THROW0(arg_error, 0, "All defined components must be belong to a AS"); + THROWF(arg_error, 0, "All defined components must be belong to a AS"); } /* set the new parse rules */ (*(new_routing->routing->load)) (); @@ -476,22 +568,20 @@ static void parse_S_AS_lua(char *id, char *mode) * When you finish to read the routing component, other structures must be created. * the "end" method allow to do that for any routing model type */ -static void parse_E_AS(char *AS_id) +static void parse_E_AS(const char *AS_id) { if (current_routing == NULL) { - THROW1(arg_error, 0, "Close AS(%s), that never open", AS_id); + THROWF(arg_error, 0, "Close AS(%s), that never open", AS_id); } else { network_element_info_t info = NULL; - xbt_assert1(!xbt_dict_get_or_null - (global_routing->where_network_elements, - current_routing->name), "The AS \"%s\" already exist", - current_routing->name); + xbt_assert(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL), + "The AS \"%s\" already exists",current_routing->name); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing->routing_father; info->rc_type = SURF_NETWORK_ELEMENT_AS; - xbt_dict_set(global_routing->where_network_elements, - current_routing->name, info, NULL); + xbt_lib_set(as_router_lib,current_routing->name,ROUTING_ASR_LEVEL,(void *) info); + (*(current_routing->routing->unload)) (); (*(current_routing->routing->end)) (); current_routing = current_routing->routing_father; @@ -511,13 +601,30 @@ static void parse_E_AS_XML(void) /* * \brief Finish the creation of a new routing component from lua */ -static void parse_E_AS_lua(char *id) +static void parse_E_AS_lua(const char *id) { parse_E_AS(id); } /* Aux Business methods */ +/** + * \brief Get the AS name of the element + * + * \param name the host name + * + */ +static char* elements_As_name(const char *name) +{ + routing_component_t as_comp; + + /* (1) find the as where the host is located */ + as_comp = ((network_element_info_t) + xbt_lib_get_or_null(host_lib,name, ROUTING_HOST_LEVEL))->rc_component; + return as_comp->name; +} + + /** * \brief Get the AS father and the first elements of the chain * @@ -530,7 +637,7 @@ static void parse_E_AS_lua(char *id) static xbt_dynar_t elements_father(const char *src, const char *dst) { - xbt_assert0(src && dst, "bad parameters for \"elements_father\" method"); + xbt_assert(src && dst, "bad parameters for \"elements_father\" method"); xbt_dynar_t result = xbt_dynar_new(sizeof(char *), NULL); @@ -544,13 +651,14 @@ static xbt_dynar_t elements_father(const char *src, const char *dst) routing_component_t *father = NULL; /* (1) find the as where the src and dst are located */ - src_as = ((network_element_info_t) - xbt_dict_get_or_null(global_routing->where_network_elements, - src))->rc_component; - dst_as = ((network_element_info_t) - xbt_dict_get_or_null(global_routing->where_network_elements, - dst))->rc_component; - xbt_assert2(src_as + void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL); + void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL); + if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL); + if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL); + src_as = ((network_element_info_t)src_data)->rc_component; + dst_as = ((network_element_info_t)dst_data)->rc_component; + + xbt_assert(src_as && dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst); @@ -570,8 +678,8 @@ static xbt_dynar_t elements_father(const char *src, const char *dst) } /* (3) find the common father */ - index_src = (path_src->used) - 1; - index_dst = (path_dst->used) - 1; + 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) { @@ -613,8 +721,8 @@ static xbt_dynar_t elements_father(const char *src, const char *dst) * \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. + * This function is called by "get_route". It allows to walk recursively + * through the routing components tree. */ static route_extended_t _get_route(const char *src, const char *dst) { @@ -622,9 +730,9 @@ 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_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); - xbt_assert0(src && dst, "bad parameters for \"_get_route\" method"); + xbt_assert(src && dst, "bad parameters for \"_get_route\" method"); route_extended_t e_route, e_route_cnt, e_route_src = NULL, e_route_dst = NULL; @@ -649,7 +757,7 @@ static route_extended_t _get_route(const char *src, const char *dst) if (strcmp(src, dst)) { e_route_cnt = (*(common_father->get_route)) (common_father, src, dst); - xbt_assert2(e_route_cnt, "no route between \"%s\" and \"%s\"", src, + xbt_assert(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); @@ -672,17 +780,17 @@ static route_extended_t _get_route(const char *src, const char *dst) (*(common_father->get_route)) (common_father, src_father->name, dst_father->name); - xbt_assert2(e_route_cnt, "no route between \"%s\" and \"%s\"", + xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", src_father->name, dst_father->name); - xbt_assert2((e_route_cnt->src_gateway == NULL) == + xbt_assert((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) { + if (strcmp(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, + xbt_assert(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); @@ -693,9 +801,9 @@ static route_extended_t _get_route(const char *src, const char *dst) xbt_dynar_push(e_route->generic_route.link_list, &link); } - if (e_route_cnt->dst_gateway != dst) { + if (strcmp(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\"", + xbt_assert(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); @@ -715,6 +823,82 @@ static route_extended_t _get_route(const char *src, const char *dst) return e_route; } +static double _get_latency(const char *src, const char *dst) +{ + double latency, latency_src, latency_dst = 0.0; + + XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); + xbt_assert(src && dst, "bad parameters for \"_get_route\" method"); + + route_extended_t e_route_cnt; + + 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); + + if (src_father == dst_father) { /* SURF_ROUTING_BASE */ + + if (strcmp(src, dst)) { + latency = + (*(common_father->get_latency)) (common_father, src, dst); + xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", src, + dst); + } else latency = 0; + } else { /* SURF_ROUTING_RECURSIVE */ + route_extended_t e_route_bypass = NULL; + if (common_father->get_bypass_route) + e_route_bypass = + (*(common_father->get_bypass_route)) (common_father, src, dst); + + xbt_assert(!e_route_bypass,"Bypass cannot work yet with get_latency"); + + e_route_cnt = + (*(common_father->get_route)) (common_father, src_father->name, + dst_father->name); + + xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", + src_father->name, dst_father->name); + + xbt_assert((e_route_cnt->src_gateway == NULL) == + (e_route_cnt->dst_gateway == NULL), + "bad gateway for route between \"%s\" and \"%s\"", src, + dst); + latency = + (*(common_father->get_latency)) (common_father, elements_As_name(src), + elements_As_name(dst)); + + xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", + src_father->name, dst_father->name); + + + if (src != e_route_cnt->src_gateway) { + + latency_src = _get_latency(src, e_route_cnt->src_gateway); + xbt_assert(latency_src>=0, "no route between \"%s\" and \"%s\"", src, + e_route_cnt->src_gateway); + latency += latency_src; + } + + if (e_route_cnt->dst_gateway != dst) { + + latency_dst = _get_latency(e_route_cnt->dst_gateway, dst); + xbt_assert(latency_dst>=0, "no route between \"%s\" and \"%s\"", + e_route_cnt->dst_gateway, dst); + latency += latency_dst; + } + + } + + xbt_dynar_free(&elem_father_list); + + return latency; +} + /** * \brief Generic method: find a route between hosts * @@ -729,16 +913,21 @@ static xbt_dynar_t get_route(const char *src, const char *dst) { 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); + xbt_dynar_t elem_father_list = NULL; + routing_component_t common_father = NULL; if (strcmp(src, dst)) e_route = _get_route(src, dst); - else + else { + elem_father_list = elements_father(src, dst); + common_father = + xbt_dynar_get_as(elem_father_list, 0, routing_component_t); + e_route = (*(common_father->get_route)) (common_father, src, dst); + xbt_dynar_free(&elem_father_list); + } - xbt_assert2(e_route, "no route between \"%s\" and \"%s\"", src, dst); + xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst); if (global_routing->last_route) xbt_dynar_free(&(global_routing->last_route)); @@ -750,11 +939,12 @@ static xbt_dynar_t get_route(const char *src, const char *dst) xbt_free(e_route->dst_gateway); xbt_free(e_route); - xbt_dynar_free(&elem_father_list); +/* if (xbt_dynar_length(global_routing->last_route) == 0) return NULL; else +*/ return global_routing->last_route; } @@ -775,6 +965,26 @@ static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst) return d; } +/*Get Latency*/ +static double get_latency(const char *src, const char *dst) +{ + + double latency = -1.0; + 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)) + latency = _get_latency(src, dst); + else + latency = (*(common_father->get_latency)) (common_father, src, dst); + + xbt_assert(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst); + xbt_dynar_free(&elem_father_list); + + return latency; +} + /** * \brief Recursive function for finalize * @@ -796,7 +1006,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\"", + xbt_assert(rc->finalize, "no defined method \"finalize\" in \"%s\"", current_routing->name); (*(rc->finalize)) (rc); } @@ -812,8 +1022,6 @@ static void finalize(void) { /* delete recursibly all the tree */ _finalize(global_routing->root); - /* delete "where" dict */ - xbt_dict_free(&(global_routing->where_network_elements)); /* delete last_route */ xbt_dynar_free(&(global_routing->last_route)); /* delete global routing structure */ @@ -853,12 +1061,18 @@ static xbt_dynar_t get_onelink_routes(void) return recursive_get_onelink_routes(global_routing->root); } -static e_surf_network_element_type_t get_network_element_type(const char +e_surf_network_element_type_t get_network_element_type(const char *name) { network_element_info_t rc = NULL; - rc = xbt_dict_get(global_routing->where_network_elements, name); - return rc->rc_type; + + rc = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL); + if(rc) return rc->rc_type; + + rc = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); + if(rc) return rc->rc_type; + + return SURF_NETWORK_ELEMENT_NULL; } /** @@ -866,14 +1080,13 @@ static e_surf_network_element_type_t get_network_element_type(const char * * Make a global routing structure and set all the parsing functions. */ -void routing_model_create(size_t size_of_links, void *loopback) +void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_t get_link_latency_fun) { - /* config the uniq global routing */ global_routing = xbt_new0(s_routing_global_t, 1); - global_routing->where_network_elements = xbt_dict_new(); global_routing->root = NULL; global_routing->get_route = get_route; + global_routing->get_latency = get_latency; global_routing->get_route_no_cleanup = get_route_no_cleanup; global_routing->get_onelink_routes = get_onelink_routes; global_routing->get_network_element_type = get_network_element_type; @@ -881,13 +1094,14 @@ void routing_model_create(size_t size_of_links, void *loopback) global_routing->loopback = loopback; global_routing->size_of_link = size_of_links; global_routing->last_route = NULL; - + get_link_latency = get_link_latency_fun; /* no current routing at moment */ current_routing = NULL; /* parse generic elements */ surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML); - surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router); + surfxml_add_callback(ETag_surfxml_host_cb_list, &parse_E_host_XML); + surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router_XML); surfxml_add_callback(STag_surfxml_route_cb_list, &parse_S_route_new_and_endpoints_XML); @@ -912,10 +1126,32 @@ void routing_model_create(size_t size_of_links, void *loopback) surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_parse_Scluster); - surfxml_add_callback(STag_surfxml_config_cb_list, - &routing_parse_Sconfig); - surfxml_add_callback(ETag_surfxml_config_cb_list, - &routing_parse_Econfig); + surfxml_add_callback(STag_surfxml_peer_cb_list, + &routing_parse_Speer); + + surfxml_add_callback(ETag_surfxml_platform_cb_list, + &clean_dict_random); + +#ifdef HAVE_TRACING + instr_routing_define_callbacks(); +#endif +} + +void surf_parse_add_callback_config(void) +{ + surfxml_add_callback(STag_surfxml_config_cb_list, &routing_parse_Sconfig); + surfxml_add_callback(ETag_surfxml_config_cb_list, &routing_parse_Econfig); + surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties_XML); + surfxml_add_callback(STag_surfxml_AS_cb_list, &surf_parse_models_setup); + surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom); +} + +void surf_parse_models_setup() +{ + routing_parse_Erandom(); + surfxml_del_callback(STag_surfxml_AS_cb_list, surf_parse_models_setup); + surf_config_models_setup(platform_filename); + free(platform_filename); } /* ************************************************************************** */ @@ -943,7 +1179,7 @@ static xbt_dynar_t full_get_onelink_routes(routing_component_t rc) xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) { int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, k1); int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, k2); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); @@ -974,7 +1210,7 @@ static xbt_dynar_t full_get_onelink_routes(routing_component_t rc) static route_extended_t full_get_route(routing_component_t rc, const char *src, const char *dst) { - xbt_assert1(rc && src + xbt_assert(rc && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", rc->name); @@ -986,7 +1222,7 @@ static route_extended_t full_get_route(routing_component_t rc, generic_src_dst_check(rc, src, dst); int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src); int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); @@ -1045,6 +1281,7 @@ static void *model_full_create(void) new_component->generic_routing.set_ASroute = model_full_set_route; new_component->generic_routing.set_bypassroute = generic_set_bypassroute; new_component->generic_routing.get_route = full_get_route; + new_component->generic_routing.get_latency = generic_get_link_latency; new_component->generic_routing.get_onelink_routes = full_get_onelink_routes; new_component->generic_routing.get_bypass_route = @@ -1052,6 +1289,7 @@ static void *model_full_create(void) new_component->generic_routing.finalize = full_finalize; new_component->generic_routing.to_index = xbt_dict_new(); new_component->generic_routing.bypassRoutes = xbt_dict_new(); + new_component->generic_routing.get_network_element_type = get_network_element_type; return new_component; } @@ -1106,10 +1344,10 @@ static void model_full_set_route(routing_component_t rc, const char *src, routing_component_full_t routing = ((routing_component_full_t) rc); size_t table_size = xbt_dict_length(routing->generic_routing.to_index); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Network elements %s or %s not found", src, dst); - xbt_assert2(xbt_dynar_length(route->generic_route.link_list) > 0, + xbt_assert(xbt_dynar_length(route->generic_route.link_list) > 0, "Invalid count of links, must be greater than zero (%s,%s)", src, dst); @@ -1123,37 +1361,41 @@ static void model_full_set_route(routing_component_t rc, const char *src, xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); xbt_dynar_foreach(route->generic_route.link_list,i,link_name) { - void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); - xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } - xbt_assert2(!xbt_dynar_compare( + xbt_assert(!xbt_dynar_compare( (void*)TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), - "The route between \"%s\" and \"%s\" already exist", src,dst); - xbt_free(link_route_to_test); + "The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst); } else { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); - else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); + else{ + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The src_gateway '%s' does not exist!",route->src_gateway); + } TO_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1); xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0); } - if( A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES - || A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES ) + if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES + || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES ) { if(route->dst_gateway && route->src_gateway) { - char * gw_src = bprintf("%s",route->src_gateway); - char * gw_dst = bprintf("%s",route->dst_gateway); - route->src_gateway = bprintf("%s",gw_dst); - route->dst_gateway = bprintf("%s",gw_src); + char *gw_tmp ; + gw_tmp = route->src_gateway; + route->src_gateway = route->dst_gateway; + route->dst_gateway = gw_tmp; } if(TO_ROUTE_FULL(*dst_id, *src_id)) { @@ -1163,29 +1405,30 @@ static void model_full_set_route(routing_component_t rc, const char *src, for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--) { link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *); - void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); - xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } - xbt_assert2(!xbt_dynar_compare( + xbt_assert(!xbt_dynar_compare( (void*)TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), - "The route between \"%s\" and \"%s\" already exist", src,dst); - xbt_free(link_route_to_test); + "The route between \"%s\" and \"%s\" already exists", src,dst); } else { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->src_gateway, src, route->dst_gateway); TO_ROUTE_FULL(*dst_id, *src_id) = generic_new_extended_route(rc->hierarchy,route,0); xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, 0); } - } + + if (rc->hierarchy == SURF_ROUTING_BASE) generic_free_route((route_t)route) ; + else generic_free_extended_route((route_extended_t)route); } /* ************************************************************************** */ @@ -1246,7 +1489,7 @@ static xbt_dynar_t floyd_get_onelink_routes(routing_component_t rc) static route_extended_t floyd_get_route(routing_component_t rc, const char *src, const char *dst) { - xbt_assert1(rc && src + xbt_assert(rc && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", rc->name); @@ -1258,7 +1501,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, generic_src_dst_check(rc, src, dst); int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src); int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); @@ -1284,7 +1527,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, pred = TO_FLOYD_PRED(*src_id, pred); if (pred == -1) /* if no pred in route -> no route to host */ break; - xbt_assert2(TO_FLOYD_LINK(pred, prev_pred), + xbt_assert(TO_FLOYD_LINK(pred, prev_pred), "Invalid link for the route between \"%s\" or \"%s\"", src, dst); @@ -1302,7 +1545,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, && strcmp(gw_dst, prev_gw_src)) { xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route)) (gw_dst, prev_gw_src); - xbt_assert2(e_route_as_to_as, "no route between \"%s\" and \"%s\"", + xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"", gw_dst, prev_gw_src); links = e_route_as_to_as; int pos = 0; @@ -1320,7 +1563,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, first = 0; } while (pred != *src_id); - xbt_assert4(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", + xbt_assert(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", *src_id, *dst_id, src, dst); if (rc->hierarchy == SURF_ROUTING_RECURSIVE) { @@ -1366,6 +1609,7 @@ static void *model_floyd_create(void) new_component->generic_routing.set_ASroute = model_floyd_set_route; new_component->generic_routing.set_bypassroute = generic_set_bypassroute; new_component->generic_routing.get_route = floyd_get_route; + new_component->generic_routing.get_latency = generic_get_link_latency; new_component->generic_routing.get_onelink_routes = floyd_get_onelink_routes; new_component->generic_routing.get_bypass_route = @@ -1373,7 +1617,7 @@ static void *model_floyd_create(void) new_component->generic_routing.finalize = floyd_finalize; new_component->generic_routing.to_index = xbt_dict_new(); new_component->generic_routing.bypassRoutes = xbt_dict_new(); - new_component->generic_routing.parse_routes = xbt_dict_new(); + new_component->generic_routing.get_network_element_type = get_network_element_type; return new_component; } @@ -1482,34 +1726,37 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, if(TO_FLOYD_LINK(*src_id, *dst_id)) { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("See Route from \"%s\" to \"%s\"", src, dst); + XBT_DEBUG("See Route from \"%s\" to \"%s\"", src, dst); else - DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); char * link_name; unsigned int cpt; xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL); xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name) { - void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); - xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } - xbt_assert2(!xbt_dynar_compare( + xbt_assert(!xbt_dynar_compare( (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), - "The route between \"%s\" and \"%s\" already exist", src,dst); - xbt_free(link_route_to_test); + "The route between \"%s\" and \"%s\" already exists", src,dst); } else { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); - else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); + else{ + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); - + if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The src_gateway '%s' does not exist!",route->src_gateway); + } TO_FLOYD_LINK(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy, route, 1); TO_FLOYD_PRED(*src_id, *dst_id) = *src_id; @@ -1517,15 +1764,15 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, ((TO_FLOYD_LINK(*src_id, *dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */ } - if( A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES - || A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES ) + if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES + || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES ) { if(TO_FLOYD_LINK(*dst_id, *src_id)) { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("See Route from \"%s\" to \"%s\"", dst, src); + XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src); else - DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->src_gateway, src, route->dst_gateway); char * link_name; unsigned int i; @@ -1533,31 +1780,30 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--) { link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *); - void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name); - xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } - xbt_assert2(!xbt_dynar_compare( + xbt_assert(!xbt_dynar_compare( (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), - "The route between \"%s\" and \"%s\" already exist", src,dst); - xbt_free(link_route_to_test); + "The route between \"%s\" and \"%s\" already exists", src,dst); } else { if(route->dst_gateway && route->src_gateway) { - char * gw_src = bprintf("%s",route->src_gateway); - char * gw_dst = bprintf("%s",route->dst_gateway); - route->src_gateway = bprintf("%s",gw_dst); - route->dst_gateway = bprintf("%s",gw_src); + char *gw_src = xbt_strdup(route->src_gateway); + char *gw_dst = xbt_strdup(route->dst_gateway); + route->src_gateway = gw_dst; + route->dst_gateway = gw_src; } if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->src_gateway, src, route->dst_gateway); TO_FLOYD_LINK(*dst_id, *src_id) = @@ -1667,9 +1913,10 @@ 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_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id); 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), @@ -1679,6 +1926,7 @@ static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, (char *) (&dst_id), sizeof(int)); + if (src_elm) src = src_elm->node; @@ -1747,7 +1995,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char *src, const char *dst) { - xbt_assert1(rc && src + xbt_assert(rc && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", rc->name); @@ -1758,7 +2006,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, generic_src_dst_check(rc, src, dst); int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src); int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); @@ -1788,7 +2036,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, 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 + xbt_assert(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) @@ -1804,7 +2052,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_s_v, node_e_v); - xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id, + xbt_assert(edge != NULL, "no route between host %d and %d", *src_id, *dst_id); e_route = (route_extended_t) xbt_graph_edge_get_data(edge); @@ -1897,7 +2145,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v); - xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id, + xbt_assert(edge != NULL, "no route between host %d and %d", *src_id, *dst_id); prev_gw_src = gw_src; @@ -1914,7 +2162,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, && strcmp(gw_dst, prev_gw_src)) { xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route)) (gw_dst, prev_gw_src); - xbt_assert2(e_route_as_to_as, "no route between \"%s\" and \"%s\"", + xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"", gw_dst, prev_gw_src); links = e_route_as_to_as; int pos = 0; @@ -1982,9 +2230,10 @@ static void *model_dijkstra_both_create(int cached) new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; new_component->generic_routing.set_route = model_dijkstra_both_set_route; - new_component->generic_routing.set_ASroute = NULL; //TODO + new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; new_component->generic_routing.set_bypassroute = generic_set_bypassroute; new_component->generic_routing.get_route = dijkstra_get_route; + new_component->generic_routing.get_latency = generic_get_link_latency; new_component->generic_routing.get_onelink_routes = dijkstra_get_onelink_routes; new_component->generic_routing.get_bypass_route = @@ -1993,7 +2242,7 @@ static void *model_dijkstra_both_create(int cached) new_component->cached = cached; new_component->generic_routing.to_index = xbt_dict_new(); new_component->generic_routing.bypassRoutes = xbt_dict_new(); - new_component->generic_routing.parse_routes = xbt_dict_new(); + new_component->generic_routing.get_network_element_type = get_network_element_type; return new_component; } @@ -2021,43 +2270,19 @@ 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 */ + if(!routing->route_graph) routing->route_graph = xbt_graph_new_graph(1, NULL); + if(!routing->graph_node_map) 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->generic_routing.parse_routes, cursor, key, data) { - keys = xbt_str_split_str(key, sep); - src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10); - dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10); - route_extended_t e_route = - generic_new_extended_route(current_routing->hierarchy, data, 0); - route_new_dijkstra(routing, src_id, dst_id, e_route); - xbt_dynar_free(&keys); - } - - /* delete the parse table */ - xbt_dict_foreach(routing->generic_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->generic_routing.parse_routes)); + if (routing->cached && !routing->route_cache) + routing->route_cache = xbt_dict_new(); /* Add the loopback if needed */ if (current_routing->hierarchy == SURF_ROUTING_BASE) @@ -2075,8 +2300,38 @@ static void model_dijkstra_both_end(void) static void model_dijkstra_both_set_route (routing_component_t rc, const char *src, const char *dst, name_route_extended_t route) { + routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; + int *src_id, *dst_id; + src_id = xbt_dict_get_or_null(rc->to_index, src); + dst_id = xbt_dict_get_or_null(rc->to_index, dst); + /* Create the topology graph */ + if(!routing->route_graph) + routing->route_graph = xbt_graph_new_graph(1, NULL); + if(!routing->graph_node_map) + routing->graph_node_map = xbt_dict_new(); + + if (routing->cached && !routing->route_cache) + routing->route_cache = xbt_dict_new(); + + if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES + || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES ) + xbt_die("Route symmetrical not supported on model dijkstra"); + + if(!route->dst_gateway && !route->src_gateway) + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); + else{ + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + route->src_gateway, dst, route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The src_gateway '%s' does not exist!",route->src_gateway); + } + route_extended_t e_route = + generic_new_extended_route(current_routing->hierarchy, route, 1); + route_new_dijkstra(routing, *src_id, *dst_id, e_route); } #ifdef HAVE_PCRE_LIB @@ -2116,9 +2371,9 @@ static void rule_route_free(void *e) xbt_dynar_free(&(*elem)->re_str_link); pcre_free((*elem)->re_src); pcre_free((*elem)->re_dst); - xbt_free((*elem)); + xbt_free(*elem); } - (*elem) = NULL; + *elem = NULL; } static void rule_route_extended_free(void *e) @@ -2130,7 +2385,7 @@ static void rule_route_extended_free(void *e) pcre_free((*elem)->generic_rule_route.re_dst); xbt_free((*elem)->re_src_gateway); xbt_free((*elem)->re_dst_gateway); - xbt_free((*elem)); + xbt_free(*elem); } } @@ -2162,12 +2417,18 @@ static void model_rulebased_set_route(routing_component_t rc, rule_route_t ruleroute = xbt_new0(s_rule_route_t, 1); const char *error; int erroffset; + + if(!strcmp(rc->routing->name,"Vivaldi")){ + if(xbt_dynar_length(route->generic_route.link_list) != 0) + xbt_die("You can't have link_ctn with Model Vivaldi."); + } + ruleroute->re_src = pcre_compile(src, 0, &error, &erroffset, NULL); - xbt_assert3(ruleroute->re_src, + xbt_assert(ruleroute->re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, src, error); ruleroute->re_dst = pcre_compile(dst, 0, &error, &erroffset, NULL); - xbt_assert3(ruleroute->re_src, + xbt_assert(ruleroute->re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, dst, error); ruleroute->re_str_link = route->generic_route.link_list; @@ -2184,14 +2445,20 @@ static void model_rulebased_set_ASroute(routing_component_t rc, rule_route_extended_t ruleroute_e = xbt_new0(s_rule_route_extended_t, 1); const char *error; int erroffset; + + if(!strcmp(rc->routing->name,"Vivaldi")){ + if(xbt_dynar_length(route->generic_route.link_list) != 0) + xbt_die("You can't have link_ctn with Model Vivaldi."); + } + ruleroute_e->generic_rule_route.re_src = pcre_compile(src, 0, &error, &erroffset, NULL); - xbt_assert3(ruleroute_e->generic_rule_route.re_src, + xbt_assert(ruleroute_e->generic_rule_route.re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, src, error); ruleroute_e->generic_rule_route.re_dst = pcre_compile(dst, 0, &error, &erroffset, NULL); - xbt_assert3(ruleroute_e->generic_rule_route.re_src, + xbt_assert(ruleroute_e->generic_rule_route.re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, dst, error); ruleroute_e->generic_rule_route.re_str_link = @@ -2199,8 +2466,8 @@ static void model_rulebased_set_ASroute(routing_component_t rc, ruleroute_e->re_src_gateway = route->src_gateway; ruleroute_e->re_dst_gateway = route->dst_gateway; xbt_dynar_push(routing->list_ASroute, &ruleroute_e); - xbt_free(route->src_gateway); - xbt_free(route->dst_gateway); +// xbt_free(route->src_gateway); +// xbt_free(route->dst_gateway); xbt_free(route); } @@ -2236,14 +2503,14 @@ static char *remplace(char *value, const char **src_list, int src_size, && value[i + number_length] <= '9') { number_length++; } - xbt_assert2(number_length != 0, + xbt_assert(number_length != 0, "bad string parameter, no number indication, at offset: %d (\"%s\")", i, value); // solve number number = atoi(value + i); i = i + number_length; - xbt_assert2(i + 2 < value_length, + xbt_assert(i + 2 < value_length, "bad string parameter, too few chars, at offset: %d (\"%s\")", i, value); @@ -2258,13 +2525,12 @@ static char *remplace(char *value, const char **src_list, int src_size, param_list = dst_list; param_size = dst_size; } else { - xbt_assert2(0, - "bad string parameter, support only \"src\" and \"dst\", at offset: %d (\"%s\")", - i, value); + xbt_die("bad string parameter, support only \"src\" and \"dst\", " + "at offset: %d (\"%s\")", i, value); } i = i + 3; - xbt_assert4(param_size >= number, + xbt_assert(param_size >= number, "bad string parameter, not enough length param_size, at offset: %d (\"%s\") %d %d", i, value, param_size, number); @@ -2285,7 +2551,7 @@ static char *remplace(char *value, const char **src_list, int src_size, } while (i < value_length && i_result_buffer < BUFFER_SIZE); - xbt_assert2(i_result_buffer < BUFFER_SIZE, + xbt_assert(i_result_buffer < BUFFER_SIZE, "solving string \"%s\", small buffer size (%d)", value, BUFFER_SIZE); result_result[i_result_buffer] = 0; @@ -2338,7 +2604,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, const char *src, const char *dst) { - xbt_assert1(rc && src + xbt_assert(rc && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", rc->name); @@ -2347,7 +2613,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; - int are_processing_units; + int are_processing_units=0; xbt_dynar_t rule_list; if (xbt_dict_get_or_null(routing->dict_processing_units, src) && xbt_dict_get_or_null(routing->dict_processing_units, dst)) { @@ -2359,9 +2625,8 @@ static route_extended_t rulebased_get_route(routing_component_t rc, are_processing_units = 0; rule_list = routing->list_ASroute; } else - xbt_assert2(NULL, - "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", - src, dst); + xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found in " + "the local table", src, dst); int rc_src = -1; int rc_dst = -1; @@ -2377,6 +2642,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, int ovector_dst[OVECCOUNT]; const char **list_src = NULL; const char **list_dst = NULL; + int res; xbt_dynar_foreach(rule_list, cpt, ruleroute) { rc_src = pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0, @@ -2386,23 +2652,20 @@ static route_extended_t rulebased_get_route(routing_component_t rc, pcre_exec(ruleroute->re_dst, NULL, dst, dst_length, 0, 0, ovector_dst, OVECCOUNT); if (rc_dst >= 0) { - xbt_assert1(!pcre_get_substring_list - (src, ovector_src, rc_src, &list_src), - "error solving substring list for src \"%s\"", src); - xbt_assert1(!pcre_get_substring_list - (dst, ovector_dst, rc_dst, &list_dst), - "error solving substring list for src \"%s\"", dst); + res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src); + xbt_assert(!res, "error solving substring list for src \"%s\"", src); + res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst); + xbt_assert(!res, "error solving substring list for src \"%s\"", dst); char *link_name; xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) { char *new_link_name = remplace(link_name, list_src, rc_src, list_dst, rc_dst); void *link = - xbt_dict_get_or_null(surf_network_model->resource_set, - new_link_name); + xbt_lib_get_or_null(link_lib, new_link_name, SURF_LINK_LEVEL); if (link) xbt_dynar_push(links_list, &link); else - THROW1(mismatch_error, 0, "Link %s not found", new_link_name); + THROWF(mismatch_error, 0, "Link %s not found", new_link_name); xbt_free(new_link_name); } } @@ -2477,8 +2740,10 @@ static void *model_rulebased_create(void) new_component->generic_routing.set_bypassroute = model_rulebased_set_bypassroute; new_component->generic_routing.get_onelink_routes = rulebased_get_onelink_routes; new_component->generic_routing.get_route = rulebased_get_route; - new_component->generic_routing.get_bypass_route = generic_get_bypassroute; //rulebased_get_bypass_route; + new_component->generic_routing.get_latency = generic_get_link_latency; + new_component->generic_routing.get_bypass_route = rulebased_get_bypass_route; new_component->generic_routing.finalize = rulebased_finalize; + new_component->generic_routing.get_network_element_type = get_network_element_type; /* initialization of internal structures */ new_component->dict_processing_units = xbt_dict_new(); new_component->dict_autonomous_systems = xbt_dict_new(); @@ -2628,7 +2893,7 @@ static void model_none_end(void) static void generic_set_processing_unit(routing_component_t rc, const char *name) { - DEBUG1("Load process unit \"%s\"", name); + XBT_DEBUG("Load process unit \"%s\"", name); int *id = xbt_new0(int, 1); xbt_dict_t _to_index; _to_index = current_routing->to_index; @@ -2639,7 +2904,7 @@ static void generic_set_processing_unit(routing_component_t rc, static void generic_set_autonomous_system(routing_component_t rc, const char *name) { - DEBUG1("Load Autonomous system \"%s\"", name); + XBT_DEBUG("Load Autonomous system \"%s\"", name); int *id = xbt_new0(int, 1); xbt_dict_t _to_index; _to_index = current_routing->to_index; @@ -2647,172 +2912,30 @@ static void generic_set_autonomous_system(routing_component_t rc, xbt_dict_set(_to_index, name, id, xbt_free); } -static int surf_pointer_resource_cmp(const void *a, const void *b) { - if(a == b) - return 0; - return 1; -} - -static int surf_link_resource_cmp(const void *a, const void *b) { - if( memcmp(a,b,global_routing->size_of_link) == 0 ); - return 0; - return 1; -} - -static void generic_set_route(routing_component_t rc, const char *src, - const char *dst, name_route_t route) +static int surf_pointer_resource_cmp(const void *a, const void *b) { - DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); - xbt_dict_t _parse_routes; - xbt_dict_t _to_index; - char *route_name; - int *src_id, *dst_id,i; - unsigned long nb_links = xbt_dynar_length(route->link_name_list); - - _to_index = current_routing->to_index; - _parse_routes = current_routing->parse_routes; - - src_id = xbt_dict_get_or_null(_to_index, src); - dst_id = xbt_dict_get_or_null(_to_index, dst); - route_name = bprintf("%d#%d", *src_id, *dst_id); - - route_t route_to_test; - route_t route_sym = xbt_new0(s_route_t, 1); - - xbt_assert2(src_id - && dst_id, "Network elements %s or %s not found", src, dst); - - xbt_assert2(xbt_dynar_length(route->link_name_list) > 0, - "Invalid count of links, must be greater than zero (%s,%s)", - src, dst); - - route_to_test = xbt_dict_get_or_null(_parse_routes, route_name); - - if(route_to_test) - xbt_assert2(!xbt_dynar_compare( - (void*)route->link_name_list, - (void*)route_to_test->link_list, - (int_f_cpvoid_cpvoid_t) surf_link_resource_cmp), - "The route between \"%s\" and \"%s\" already exist", src,dst); - else - { - xbt_dict_set(_parse_routes, bprintf("%d#%d", *src_id, *dst_id), route, NULL); - } - - if(A_surfxml_route_symetrical == A_surfxml_route_symetrical_YES) - { - route_sym->link_list = xbt_dynar_new(sizeof(char *),NULL); - - for(i=nb_links ; i>0 ; i--) - { - char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(route->link_name_list, i-1, char *))); - link_name = xbt_strdup(xbt_dynar_get_as(route->link_name_list, i-1, char *)); - xbt_dynar_push_as(route_sym->link_list ,char *, link_name); - } - DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); - - route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d",*dst_id, *src_id)); - - if(route_to_test) - xbt_assert2(!xbt_dynar_compare( - (void*)route_sym->link_list, - (void*)route_to_test->link_list, - (int_f_cpvoid_cpvoid_t) strcmp), - "The route between \"%s\" and \"%s\" already exist", dst,src); - else - { - xbt_dict_set(_parse_routes, bprintf("%d#%d",*dst_id, *src_id), route_sym, NULL); - } - } - - xbt_free(route_name); + return a != b; } -static void generic_set_ASroute(routing_component_t rc, const char *src, - const char *dst, route_extended_t e_route) +static int surf_link_resource_cmp(const void *a, const void *b) { - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, - e_route->src_gateway, dst, e_route->dst_gateway); - - xbt_dict_t _parse_routes; - xbt_dict_t _to_index; - char *route_name; - int *src_id, *dst_id; - _to_index = current_routing->to_index; - _parse_routes = current_routing->parse_routes; - - src_id = xbt_dict_get_or_null(_to_index, src); - dst_id = xbt_dict_get_or_null(_to_index, dst); - route_name = bprintf("%d#%d", *src_id, *dst_id); - route_t route_to_test; - - xbt_assert2(src_id - && dst_id, "Network elements %s or %s not found", 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); - - route_to_test = xbt_dict_get_or_null(_parse_routes, route_name); - - if(route_to_test) - xbt_assert4(!xbt_dynar_compare( - (void*) (&e_route->generic_route)->link_list, - (void*) route_to_test->link_list, - (int_f_cpvoid_cpvoid_t) strcmp), - "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist", - src, e_route->src_gateway, dst, e_route->dst_gateway); - - route_name = bprintf("%d#%d", *src_id, *dst_id); - xbt_dict_set(_parse_routes, route_name, e_route, NULL); - xbt_free(route_name); - - unsigned long nb_links = xbt_dynar_length(e_route->generic_route.link_list); - - if(A_surfxml_ASroute_symetrical == A_surfxml_ASroute_symetrical_YES) - { - int i; - route_extended_t route_sym = xbt_new0(s_route_extended_t, 1); - route_sym->generic_route.link_list = xbt_dynar_new(sizeof(char *),NULL); - for(i=nb_links ; i>0 ; i--) - { - char *link_name = xbt_new0(char,strlen(xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *))); - link_name = bprintf("%s",xbt_dynar_get_as(e_route->generic_route.link_list, i-1, char *)); - xbt_dynar_push_as(route_sym->generic_route.link_list ,char *, link_name); - } - route_sym->src_gateway = xbt_new0( char,strlen(e_route->dst_gateway) ); - route_sym->src_gateway = bprintf("%s",e_route->dst_gateway); - route_sym->dst_gateway = xbt_new0( char,strlen(e_route->src_gateway) ); - route_sym->dst_gateway = bprintf("%s",e_route->src_gateway); - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"",dst, route_sym->src_gateway,src,route_sym->dst_gateway); - - route_to_test = xbt_dict_get_or_null(_parse_routes, bprintf("%d#%d", *dst_id, *src_id)); - if(route_to_test) - xbt_assert4(!xbt_dynar_compare( - (void*) (&route_sym->generic_route)->link_list, - (void*) route_to_test->link_list, - (int_f_cpvoid_cpvoid_t) strcmp), - "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist", - dst, route_sym->src_gateway, src, route_sym->dst_gateway); - xbt_dict_set(_parse_routes, bprintf("%d#%d", *dst_id, *src_id), route_sym, NULL); - - } + return !!memcmp(a,b,global_routing->size_of_link); } 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); + XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst); xbt_dict_t dict_bypassRoutes = rc->bypassRoutes; char *route_name; route_name = bprintf("%s#%s", src, dst); - xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0, + xbt_assert(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", + xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name), + "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists", src, e_route->src_gateway, dst, e_route->dst_gateway); route_extended_t new_e_route = @@ -2828,6 +2951,21 @@ static void generic_set_bypassroute(routing_component_t rc, /* ************************************************************************** */ /* *********************** GENERIC BUSINESS METHODS ************************* */ +static double generic_get_link_latency(routing_component_t rc, + const char *src, const char *dst) +{ + route_extended_t route = rc->get_route(rc,src,dst); + void * link; + unsigned int i; + double latency = 0.0; + + xbt_dynar_foreach(route->generic_route.link_list,i,link) { + latency += get_link_latency(link); + } + generic_free_extended_route(route); + return latency; +} + static xbt_dynar_t generic_get_onelink_routes(routing_component_t rc) { xbt_die("\"generic_get_onelink_routes\" not implemented yet"); @@ -2847,16 +2985,17 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, routing_component_t *current_dst = NULL; /* (1) find the as where the src and dst are located */ - src_as = ((network_element_info_t) - xbt_dict_get_or_null(global_routing->where_network_elements, - src))->rc_component; - dst_as = ((network_element_info_t) - xbt_dict_get_or_null(global_routing->where_network_elements, - dst))->rc_component; - xbt_assert2(src_as - && dst_as, - "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, - dst); + void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL); + void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL); + if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL); + if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL); + + if(src_data == NULL || dst_data == NULL) + xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", + src, dst, rc->name); + + src_as = ((network_element_info_t)src_data)->rc_component; + dst_as = ((network_element_info_t)dst_data)->rc_component; /* (2) find the path to the root routing component */ path_src = xbt_dynar_new(sizeof(routing_component_t), NULL); @@ -2873,8 +3012,8 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, } /* (3) find the common father */ - index_src = (path_src->used) - 1; - index_dst = (path_dst->used) - 1; + 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) { @@ -2887,8 +3026,8 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, 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_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; @@ -2969,6 +3108,44 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, /* ************************************************************************** */ /* ************************* GENERIC AUX FUNCTIONS ************************** */ +static route_t +generic_new_route(e_surf_routing_hierarchy_t hierarchy, + void *data, int order) +{ + + char *link_name; + route_t new_route; + unsigned int cpt; + xbt_dynar_t links = NULL, links_id = NULL; + + new_route = xbt_new0(s_route_t, 1); + new_route->link_list = + xbt_dynar_new(global_routing->size_of_link, NULL); + + xbt_assert(hierarchy == SURF_ROUTING_BASE, + "the hierarchy type is not SURF_ROUTING_BASE"); + + links = ((route_t) data)->link_list; + + + links_id = new_route->link_list; + + xbt_dynar_foreach(links, cpt, link_name) { + + void *link = + xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + if (link) { + if (order) + xbt_dynar_push(links_id, &link); + else + xbt_dynar_unshift(links_id, &link); + } else + THROWF(mismatch_error, 0, "Link %s not found", link_name); + } + + return new_route; +} + static route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, void *data, int order) @@ -2986,7 +3163,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, new_e_route->src_gateway = NULL; new_e_route->dst_gateway = NULL; - xbt_assert0(hierarchy == SURF_ROUTING_BASE + xbt_assert(hierarchy == SURF_ROUTING_BASE || hierarchy == SURF_ROUTING_RECURSIVE, "the hierarchy type is not defined"); @@ -2998,13 +3175,13 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, } else if (hierarchy == SURF_ROUTING_RECURSIVE) { e_route = (route_extended_t) data; - xbt_assert0(e_route->src_gateway + xbt_assert(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; + new_e_route->src_gateway = strdup(e_route->src_gateway); + new_e_route->dst_gateway = strdup(e_route->dst_gateway); } links_id = new_e_route->generic_route.link_list; @@ -3012,14 +3189,14 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, xbt_dynar_foreach(links, cpt, link_name) { void *link = - xbt_dict_get_or_null(surf_network_model->resource_set, link_name); + xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); 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); + THROWF(mismatch_error, 0, "Link %s not found", link_name); } return new_e_route; @@ -3072,9 +3249,7 @@ generic_autonomous_system_exist(routing_component_t rc, char *element) xbt_dict_cursor_t cursor = NULL; char *key; element_as = ((network_element_info_t) - xbt_dict_get_or_null - (global_routing->where_network_elements, - element))->rc_component; + xbt_lib_get_or_null(as_router_lib, element, ROUTING_ASR_LEVEL))->rc_component; result = ((routing_component_t) - 1); if (element_as != rc) result = generic_as_exist(rc, element_as); @@ -3097,9 +3272,8 @@ generic_processing_units_exist(routing_component_t rc, char *element) { routing_component_t element_as; element_as = ((network_element_info_t) - xbt_dict_get_or_null - (global_routing->where_network_elements, - element))->rc_component; + xbt_lib_get_or_null(host_lib, + element, ROUTING_HOST_LEVEL))->rc_component; if (element_as == rc) return element_as; return generic_as_exist(rc, element_as); @@ -3109,42 +3283,46 @@ static void generic_src_dst_check(routing_component_t rc, const char *src, const char *dst) { - routing_component_t src_as = ((network_element_info_t) - xbt_dict_get_or_null - (global_routing->where_network_elements, - src))->rc_component; - routing_component_t dst_as = ((network_element_info_t) - xbt_dict_get_or_null - (global_routing->where_network_elements, - dst))->rc_component; - - 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", + void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL); + void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL); + if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL); + if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL); + + if(src_data == NULL || dst_data == NULL) + xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", + src, dst, rc->name); + + routing_component_t src_as = ((network_element_info_t)src_data)->rc_component; + routing_component_t dst_as = ((network_element_info_t)dst_data)->rc_component; + + if(src_as != dst_as) + xbt_die("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); + if(rc != dst_as) + xbt_die("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)", + src,dst,src_as->name, dst_as->name,rc->name); } static void routing_parse_Sconfig(void) { - //TODO - DEBUG0("WARNING tag config not yet implemented."); - DEBUG1("Configuration name = %s",A_surfxml_config_id); + XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); } static void routing_parse_Econfig(void) { - //TODO xbt_dict_cursor_t cursor = NULL; char *key; char *elem; + char *cfg; xbt_dict_foreach(current_property_set, cursor, key, elem) { - DEBUG2("property : %s = %s",key,elem); - } + cfg = bprintf("%s:%s",key,elem); + if(xbt_cfg_is_default_value(_surf_cfg_set, key)) + xbt_cfg_set_parse(_surf_cfg_set, cfg); + else + XBT_INFO("The custom configuration '%s' is already define by user!",key); + free(cfg); + } + XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); } static void routing_parse_Scluster(void) @@ -3156,12 +3334,31 @@ static void routing_parse_Scluster(void) char *cluster_suffix = A_surfxml_cluster_suffix; char *cluster_radical = A_surfxml_cluster_radical; char *cluster_power = A_surfxml_cluster_power; + char *cluster_core = A_surfxml_cluster_core; char *cluster_bw = A_surfxml_cluster_bw; char *cluster_lat = A_surfxml_cluster_lat; + char *temp_cluster_bw = NULL; + char *temp_cluster_lat = NULL; + char *temp_cluster_power = NULL; char *cluster_bb_bw = A_surfxml_cluster_bb_bw; char *cluster_bb_lat = A_surfxml_cluster_bb_lat; + char *cluster_availability_file = A_surfxml_cluster_availability_file; + char *cluster_state_file = A_surfxml_cluster_state_file; char *host_id, *groups, *link_id = NULL; - char *router_id, *link_router, *link_backbone, *route_src_dst; + char *router_id, *link_router, *link_backbone; + char *availability_file = xbt_strdup(cluster_availability_file); + char *state_file = xbt_strdup(cluster_state_file); + + if(xbt_dict_size(patterns)==0) + patterns = xbt_dict_new(); + + xbt_dict_set(patterns,"id",cluster_id,NULL); + xbt_dict_set(patterns,"prefix",cluster_prefix,NULL); + xbt_dict_set(patterns,"suffix",cluster_suffix,NULL); + +#ifdef HAVE_PCRE_LIB + char *route_src_dst; +#endif unsigned int iter; int start, end, i; xbt_dynar_t radical_elements; @@ -3185,10 +3382,10 @@ static void routing_parse_Scluster(void) SURFXML_BUFFER_SET(AS_id, cluster_id); #ifdef HAVE_PCRE_LIB SURFXML_BUFFER_SET(AS_routing, "RuleBased"); - DEBUG1("", cluster_id); + XBT_DEBUG("", cluster_id); #else SURFXML_BUFFER_SET(AS_routing, "Full"); - DEBUG1("", cluster_id); + XBT_DEBUG("", cluster_id); #endif SURFXML_START_TAG(AS); @@ -3205,17 +3402,34 @@ static void routing_parse_Scluster(void) #endif link_id = bprintf("%s_link_%d", cluster_id, start); - DEBUG2("", host_id, cluster_power); + xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free); + temp_cluster_power = xbt_strdup(cluster_power); + temp_cluster_power = replace_random_parameter(temp_cluster_power); + XBT_DEBUG("", host_id, temp_cluster_power); A_surfxml_host_state = A_surfxml_host_state_ON; SURFXML_BUFFER_SET(host_id, host_id); - SURFXML_BUFFER_SET(host_power, cluster_power); + SURFXML_BUFFER_SET(host_power, temp_cluster_power); + SURFXML_BUFFER_SET(host_core, cluster_core); SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, ""); - SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_coordinates, ""); + xbt_free(availability_file); + availability_file = xbt_strdup(cluster_availability_file); + xbt_free(state_file); + state_file = xbt_strdup(cluster_state_file); + XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns)); + XBT_DEBUG("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns)); + SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns)); + SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns)); + XBT_DEBUG(""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); - DEBUG3("", link_id,cluster_bw, cluster_lat); + + temp_cluster_bw = xbt_strdup(cluster_bw); + temp_cluster_bw = replace_random_parameter(temp_cluster_bw); + temp_cluster_lat = xbt_strdup(cluster_lat); + temp_cluster_lat = replace_random_parameter(temp_cluster_lat); + XBT_DEBUG("", link_id,temp_cluster_bw, cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3223,14 +3437,19 @@ static void routing_parse_Scluster(void) if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_id); - SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); - SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw); + SURFXML_BUFFER_SET(link_latency, temp_cluster_lat); SURFXML_BUFFER_SET(link_bandwidth_file, ""); SURFXML_BUFFER_SET(link_latency_file, ""); SURFXML_BUFFER_SET(link_state_file, ""); SURFXML_START_TAG(link); SURFXML_END_TAG(link); + xbt_free(temp_cluster_bw); + xbt_free(temp_cluster_lat); + xbt_free(temp_cluster_power); + free(link_id); + free(host_id); break; case 2: @@ -3238,7 +3457,6 @@ static void routing_parse_Scluster(void) surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *)); surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *)); - DEBUG2("Create hosts and links from %d to %d", start, end); for (i = start; i <= end; i++) { host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix); #ifndef HAVE_PCRE_LIB @@ -3246,17 +3464,35 @@ static void routing_parse_Scluster(void) #endif link_id = bprintf("%s_link_%d", cluster_id, i); - DEBUG2("", host_id, cluster_power); + xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free); + temp_cluster_power = xbt_strdup(cluster_power); + temp_cluster_power = replace_random_parameter(temp_cluster_power); + XBT_DEBUG("", host_id, temp_cluster_power); A_surfxml_host_state = A_surfxml_host_state_ON; SURFXML_BUFFER_SET(host_id, host_id); - SURFXML_BUFFER_SET(host_power, cluster_power); + SURFXML_BUFFER_SET(host_power, temp_cluster_power); + SURFXML_BUFFER_SET(host_core, cluster_core); SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, ""); - SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_coordinates, ""); + xbt_free(availability_file); + availability_file = xbt_strdup(cluster_availability_file); + xbt_free(state_file); + state_file = xbt_strdup(cluster_state_file); + XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns)); + XBT_DEBUG("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns)); + SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns)); + SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns)); + XBT_DEBUG(""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); - DEBUG3("", link_id,cluster_bw, cluster_lat); + xbt_free(temp_cluster_power); + + temp_cluster_bw = xbt_strdup(cluster_bw); + temp_cluster_bw = replace_random_parameter(temp_cluster_bw); + temp_cluster_lat = xbt_strdup(cluster_lat); + temp_cluster_lat = replace_random_parameter(temp_cluster_lat); + XBT_DEBUG("", link_id,temp_cluster_bw, cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3264,36 +3500,49 @@ static void routing_parse_Scluster(void) if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_id); - SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); - SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw); + SURFXML_BUFFER_SET(link_latency, temp_cluster_lat); SURFXML_BUFFER_SET(link_bandwidth_file, ""); SURFXML_BUFFER_SET(link_latency_file, ""); SURFXML_BUFFER_SET(link_state_file, ""); SURFXML_START_TAG(link); SURFXML_END_TAG(link); + + xbt_free(temp_cluster_bw); + xbt_free(temp_cluster_lat); + free(link_id); + free(host_id); } break; default: - DEBUG0("Malformed radical"); + XBT_DEBUG("Malformed radical"); } xbt_dynar_free(&radical_ends); } + xbt_dynar_free(&radical_elements); - DEBUG0(" "); + XBT_DEBUG(" "); router_id = bprintf("%s%s_router%s", cluster_prefix, cluster_id, cluster_suffix); link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id); link_backbone = bprintf("%s_backbone", cluster_id); - DEBUG1("", router_id); - SURFXML_BUFFER_SET(router_id, router_id);; + XBT_DEBUG("", router_id); + SURFXML_BUFFER_SET(router_id, router_id); + SURFXML_BUFFER_SET(router_coordinates, ""); SURFXML_START_TAG(router); SURFXML_END_TAG(router); - DEBUG3("", link_router,cluster_bw, cluster_lat); + //TODO + xbt_dict_set(patterns, "radical", xbt_strdup("_router"), xbt_free); + temp_cluster_bw = xbt_strdup(cluster_bw); + temp_cluster_bw = replace_random_parameter(temp_cluster_bw); + temp_cluster_lat = xbt_strdup(cluster_lat); + temp_cluster_lat = replace_random_parameter(temp_cluster_lat); + XBT_DEBUG("", link_router,temp_cluster_bw, temp_cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3301,15 +3550,18 @@ static void routing_parse_Scluster(void) if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_router); - SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); - SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw); + SURFXML_BUFFER_SET(link_latency, temp_cluster_lat); SURFXML_BUFFER_SET(link_bandwidth_file, ""); SURFXML_BUFFER_SET(link_latency_file, ""); SURFXML_BUFFER_SET(link_state_file, ""); SURFXML_START_TAG(link); SURFXML_END_TAG(link); - DEBUG3("", link_backbone,cluster_bw, cluster_lat); + xbt_free(temp_cluster_bw); + xbt_free(temp_cluster_lat); + + XBT_DEBUG("", link_backbone,cluster_bb_bw, cluster_bb_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE) @@ -3323,51 +3575,63 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link); SURFXML_END_TAG(link); - char *new_suffix = bprintf("%s", ""); + XBT_DEBUG(" "); + +#ifdef HAVE_PCRE_LIB + char *new_suffix = xbt_strdup(""); radical_elements = xbt_str_split(cluster_suffix, "."); xbt_dynar_foreach(radical_elements, iter, groups) { if (strcmp(groups, "")) { - new_suffix = bprintf("%s\\.%s", new_suffix, groups); + char *old_suffix = new_suffix; + new_suffix = bprintf("%s\\.%s", old_suffix, groups); + free(old_suffix); } } route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix); + xbt_dynar_free(&radical_elements); + free(new_suffix); - DEBUG0(" "); + char *pcre_link_src = bprintf("%s_link_$1src", cluster_id); + char *pcre_link_backbone = bprintf("%s_backbone", cluster_id); + char *pcre_link_dst = bprintf("%s_link_$1dst", cluster_id); -#ifdef HAVE_PCRE_LIB - - DEBUG2(""); + XBT_DEBUG(""); SURFXML_BUFFER_SET(route_src, route_src_dst); SURFXML_BUFFER_SET(route_dst, route_src_dst); - A_surfxml_route_symetrical = A_surfxml_route_symetrical_NO; + A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); - DEBUG1("", cluster_id); - SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1src", cluster_id)); + XBT_DEBUG("", pcre_link_src); + SURFXML_BUFFER_SET(link_ctn_id, pcre_link_src); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;} SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG1("", cluster_id); - SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id)); + XBT_DEBUG("", pcre_link_backbone); + SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG1("", cluster_id); - SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1dst", cluster_id)); + XBT_DEBUG("", pcre_link_dst); + SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;} SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG0(""); + XBT_DEBUG(""); SURFXML_END_TAG(route); + + free(pcre_link_dst); + free(pcre_link_backbone); + free(pcre_link_src); + free(route_src_dst); #else for (i = 0; i <= xbt_dynar_length(tab_elements_num); i++) { for (j = 0; j <= xbt_dynar_length(tab_elements_num); j++) { @@ -3389,11 +3653,11 @@ static void routing_parse_Scluster(void) cluster_suffix); } - DEBUG2(""); + XBT_DEBUG(""); SURFXML_BUFFER_SET(route_src, route_src); SURFXML_BUFFER_SET(route_dst, route_dst); - A_surfxml_route_symetrical = A_surfxml_route_symetrical_NO; + A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); if (i == xbt_dynar_length(tab_elements_num)) { @@ -3412,7 +3676,7 @@ static void routing_parse_Scluster(void) xbt_dynar_get_as(tab_elements_num, j, int)); } - DEBUG1("", route_src); + XBT_DEBUG("", route_src); SURFXML_BUFFER_SET(link_ctn_id, route_src); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3420,13 +3684,13 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG1("", cluster_id); + XBT_DEBUG("", cluster_id); SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id)); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG1("", route_dst); + XBT_DEBUG("", route_dst); SURFXML_BUFFER_SET(link_ctn_id, route_dst); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3434,20 +3698,306 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG0(""); + XBT_DEBUG(""); SURFXML_END_TAG(route); } } xbt_dynar_free(&tab_elements_num); + #endif - DEBUG0(""); + free(router_id); + free(link_backbone); + free(link_router); + xbt_dict_free(&patterns); + free(availability_file); + free(state_file); + + XBT_DEBUG(""); SURFXML_END_TAG(AS); - DEBUG0(" "); + XBT_DEBUG(" "); + + surfxml_bufferstack_pop(1); +} +/* + * This function take a string and replace parameters from patterns dict. + * It returns the new value. + */ +static char* replace_random_parameter(char * string) +{ + char *test_string = NULL; + + if(xbt_dict_size(random_value)==0) + return string; + + string = xbt_str_varsubst(string, patterns); // for patterns of cluster + test_string = bprintf("${%s}", string); + test_string = xbt_str_varsubst(test_string,random_value); //Add ${xxxxx} for random Generator + + if (strcmp(test_string,"")) { //if not empty, keep this value. + xbt_free(string); + string = test_string; + } //In other case take old value (without ${}) + else + free(test_string); + return string; +} + +static void clean_dict_random(void) +{ + xbt_dict_free(&random_value); + xbt_dict_free(&patterns); +} + +static void routing_parse_Speer(void) +{ + static int AX_ptr = 0; + + char *peer_id = A_surfxml_peer_id; + char *peer_power = A_surfxml_peer_power; + char *peer_bw_in = A_surfxml_peer_bw_in; + char *peer_bw_out = A_surfxml_peer_bw_out; + char *peer_lat = A_surfxml_peer_lat; + char *peer_coord = A_surfxml_peer_coordinates; + char *peer_state_file = A_surfxml_peer_state_file; + char *peer_availability_file = A_surfxml_peer_availability_file; + + char *host_id = NULL; + char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down; + + static unsigned int surfxml_buffer_stack_stack_ptr = 1; + static unsigned int surfxml_buffer_stack_stack[1024]; + + surfxml_buffer_stack_stack[0] = 0; + + surfxml_bufferstack_push(1); + + SURFXML_BUFFER_SET(AS_id, peer_id); + + SURFXML_BUFFER_SET(AS_routing, "Full"); + XBT_DEBUG("", peer_id); + + SURFXML_START_TAG(AS); + + XBT_DEBUG(" "); + host_id = bprintf("peer_%s", peer_id); + router_id = bprintf("router_%s", peer_id); + link_id_up = bprintf("link_%s_up", peer_id); + link_id_down = bprintf("link_%s_down", peer_id); + + link_router = bprintf("%s_link_router", peer_id); + link_backbone = bprintf("%s_backbone", peer_id); + + XBT_DEBUG("", host_id, peer_power); + A_surfxml_host_state = A_surfxml_host_state_ON; + SURFXML_BUFFER_SET(host_id, host_id); + SURFXML_BUFFER_SET(host_power, peer_power); + SURFXML_BUFFER_SET(host_availability, "1.0"); + SURFXML_BUFFER_SET(host_availability_file, peer_availability_file); + SURFXML_BUFFER_SET(host_state_file, peer_state_file); + SURFXML_BUFFER_SET(host_coordinates, ""); + SURFXML_START_TAG(host); + SURFXML_END_TAG(host); + + XBT_DEBUG("", router_id, peer_coord); + SURFXML_BUFFER_SET(router_id, router_id); + SURFXML_BUFFER_SET(router_coordinates, peer_coord); + SURFXML_START_TAG(router); + SURFXML_END_TAG(router); + + XBT_DEBUG("", link_id_up, peer_bw_in, peer_lat); + A_surfxml_link_state = A_surfxml_link_state_ON; + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + SURFXML_BUFFER_SET(link_id, link_id_up); + SURFXML_BUFFER_SET(link_bandwidth, peer_bw_in); + SURFXML_BUFFER_SET(link_latency, peer_lat); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_latency_file, ""); + SURFXML_BUFFER_SET(link_state_file, ""); + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); + + XBT_DEBUG("", link_id_down, peer_bw_out, peer_lat); + A_surfxml_link_state = A_surfxml_link_state_ON; + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; + SURFXML_BUFFER_SET(link_id, link_id_down); + SURFXML_BUFFER_SET(link_bandwidth, peer_bw_out); + SURFXML_BUFFER_SET(link_latency, peer_lat); + SURFXML_BUFFER_SET(link_bandwidth_file, ""); + SURFXML_BUFFER_SET(link_latency_file, ""); + SURFXML_BUFFER_SET(link_state_file, ""); + SURFXML_START_TAG(link); + SURFXML_END_TAG(link); + + XBT_DEBUG(" "); + // begin here + XBT_DEBUG(""); + SURFXML_BUFFER_SET(route_src, host_id); + SURFXML_BUFFER_SET(route_dst, router_id); + A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; + SURFXML_START_TAG(route); + + XBT_DEBUG("", link_id_up); + SURFXML_BUFFER_SET(link_ctn_id, link_id_up); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; + SURFXML_START_TAG(link_ctn); + SURFXML_END_TAG(link_ctn); + + XBT_DEBUG(""); + SURFXML_END_TAG(route); + + //Opposite Route + XBT_DEBUG(""); + SURFXML_BUFFER_SET(route_src, router_id); + SURFXML_BUFFER_SET(route_dst, host_id); + A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; + SURFXML_START_TAG(route); + + XBT_DEBUG("", link_id_down); + SURFXML_BUFFER_SET(link_ctn_id, link_id_down); + A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; + SURFXML_START_TAG(link_ctn); + SURFXML_END_TAG(link_ctn); + + XBT_DEBUG(""); + SURFXML_END_TAG(route); + + XBT_DEBUG(""); + SURFXML_END_TAG(AS); + XBT_DEBUG(" "); + + //xbt_dynar_free(&tab_elements_num); + free(host_id); + free(router_id); + free(link_router); + free(link_backbone); + free(link_id_up); + free(link_id_down); surfxml_bufferstack_pop(1); } +static void routing_parse_Srandom(void) +{ + double mean, std, min, max, seed; + char *random_id = A_surfxml_random_id; + char *random_radical = A_surfxml_random_radical; + char *rd_name = NULL; + char *rd_value; + surf_parse_get_double(&mean,A_surfxml_random_mean); + surf_parse_get_double(&std,A_surfxml_random_std_deviation); + surf_parse_get_double(&min,A_surfxml_random_min); + surf_parse_get_double(&max,A_surfxml_random_max); + surf_parse_get_double(&seed,A_surfxml_random_seed); + + double res = 0; + int i = 0; + random_data_t random = xbt_new0(s_random_data_t, 1); + char *tmpbuf; + + xbt_dynar_t radical_elements; + unsigned int iter; + char *groups; + int start, end; + xbt_dynar_t radical_ends; + + random->generator = A_surfxml_random_generator; + random->seed = seed; + random->min = min; + random->max = max; + + /* Check user stupidities */ + if (max < min) + THROWF(arg_error, 0, "random->max < random->min (%f < %f)", max, min); + if (mean < min) + THROWF(arg_error, 0, "random->mean < random->min (%f < %f)", mean, + min); + if (mean > max) + THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean, + max); + + /* normalize the mean and standard deviation before storing */ + random->mean = (mean - min) / (max - min); + random->std = std / (max - min); + + if (random->mean * (1 - random->mean) < random->std * random->std) + THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)", + random->mean, random->std); + + XBT_DEBUG("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'", + random_id, + random->min, + random->max, + random->mean, + random->std, + random->generator, + random->seed, + random_radical); + + if(xbt_dict_size(random_value)==0) + random_value = xbt_dict_new(); + + if(!strcmp(random_radical,"")) + { + res = random_generate(random); + rd_value = bprintf("%f",res); + xbt_dict_set(random_value, random_id, rd_value, free); + } + else + { + radical_elements = xbt_str_split(random_radical, ","); + xbt_dynar_foreach(radical_elements, iter, groups) { + radical_ends = xbt_str_split(groups, "-"); + switch (xbt_dynar_length(radical_ends)) { + case 1: + xbt_assert(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",random_id); + res = random_generate(random); + tmpbuf = bprintf("%s%d",random_id,atoi(xbt_dynar_getfirst_as(radical_ends,char *))); + xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free); + xbt_free(tmpbuf); + break; + + case 2: surf_parse_get_int(&start, + xbt_dynar_get_as(radical_ends, 0, char *)); + surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *)); + for (i = start; i <= end; i++) { + xbt_assert(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",bprintf("%s%d",random_id,i)); + res = random_generate(random); + tmpbuf = bprintf("%s%d",random_id,i); + xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free); + xbt_free(tmpbuf); + } + break; + default: + XBT_INFO("Malformed radical"); + } + res = random_generate(random); + rd_name = bprintf("%s_router",random_id); + rd_value = bprintf("%f",res); + xbt_dict_set(random_value, rd_name, rd_value, free); + + xbt_dynar_free(&radical_ends); + } + free(rd_name); + xbt_dynar_free(&radical_elements); + } +} + +static void routing_parse_Erandom(void) +{ + xbt_dict_cursor_t cursor = NULL; + char *key; + char *elem; + + xbt_dict_foreach(random_value, cursor, key, elem) { + XBT_DEBUG("%s = %s",key,elem); + } + +} + + /* * New methods to init the routing model component from the lua script */ @@ -3474,7 +4024,7 @@ void routing_AS_end(const char *AS_id) void routing_add_host(const char *host_id) { - parse_S_host_lua((char *) host_id); + parse_S_host_lua((char *) host_id, (char*)""); // FIXME propagate coordinate system to lua } /* @@ -3490,7 +4040,7 @@ void routing_add_link(const char *link_id) */ void routing_set_route(const char *src_id, const char *dst_id) { - parse_S_route_new_and_endpoints_lua((char *) src_id, (char *) dst_id); + parse_S_route_new_and_endpoints_lua(src_id, dst_id); } /*