X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92a73f2197461e843f3a9f94d2b6305e8ab4e550..e93a91fdbfece38a7de51e9da40c6388cdd0d6c8:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 644ef18f96..eaf46a2057 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -1,14 +1,16 @@ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009, 2010, 2011. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#ifdef HAVE_PCRE_LIB #include /* regular expression library */ -#endif + +#include "simgrid/platf_interface.h" // platform creation API internal interface + #include "surf_routing_private.h" #include "surf/surf_routing.h" +#include "surf/surfxml_parse_values.h" xbt_lib_t host_lib; int ROUTING_HOST_LEVEL; //Routing level @@ -48,15 +50,11 @@ static double_f_cpvoid_t get_link_latency = NULL; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); -static void routing_parse_Speer(void); /* peer bypass */ +static void routing_parse_Speer(sg_platf_peer_cbarg_t peer); /* peer bypass */ static void routing_parse_Srandom(void); /* random bypass */ -static void routing_parse_Erandom(void); /* random bypass */ - -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); +static void clean_routing_after_parse(void); /* this lines are only for replace use like index in the model table */ typedef enum { @@ -65,190 +63,94 @@ typedef enum { SURF_MODEL_DIJKSTRA, SURF_MODEL_DIJKSTRACACHE, SURF_MODEL_NONE, -#ifdef HAVE_PCRE_LIB - SURF_MODEL_RULEBASED -#endif + SURF_MODEL_RULEBASED, + SURF_MODEL_VIVALDI, + SURF_MODEL_CLUSTER } e_routing_types; -struct s_model_type routing_models[] = { {"Full", - "Full routing data (fast, large memory requirements, fully expressive)", - model_full_create, - model_full_load, - model_full_unload, - model_full_end}, -{"Floyd", - "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)", - model_floyd_create, model_floyd_load, model_floyd_unload, - model_floyd_end}, -{"Dijkstra", - "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)", - model_dijkstra_create, model_dijkstra_both_load, - model_dijkstra_both_unload, model_dijkstra_both_end}, -{"DijkstraCache", - "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", - model_dijkstracache_create, model_dijkstra_both_load, - model_dijkstra_both_unload, model_dijkstra_both_end}, -{"none", "No routing (usable with Constant network only)", - model_none_create, model_none_load, model_none_unload, model_none_end}, -#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} +struct s_model_type routing_models[] = { + { "Full", "Full routing data (fast, large memory requirements, fully expressive)", + model_full_create, model_full_load, model_full_unload, model_full_end + }, + { "Floyd", "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)", + model_floyd_create, model_floyd_load, model_floyd_unload, model_floyd_end + }, + { "Dijkstra", "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)", + model_dijkstra_create, model_dijkstra_both_load, + model_dijkstra_both_unload, model_dijkstra_both_end + }, + { "DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", + model_dijkstracache_create, model_dijkstra_both_load, model_dijkstra_both_unload, model_dijkstra_both_end + }, + { "none", "No routing (usable with Constant network only)", + model_none_create, model_none_load, model_none_unload, model_none_end + }, + { "RuleBased", "Rule-Based routing data (...)", + model_rulebased_create, model_none_load, model_none_unload, model_none_end + }, + { "Vivaldi", "Vivaldi routing", + model_vivaldi_create, model_none_load, model_none_unload, model_none_end + }, + {"Cluster", "Cluster routing", + model_cluster_create, model_none_load, model_cluster_unload, model_none_end + }, + {NULL, NULL, NULL, NULL, NULL, NULL} }; -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 base_vivaldi_get_latency (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; -} - -static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst, route_extended_t e_route) -{ - if(get_network_element_type(src) == SURF_NETWORK_ELEMENT_AS) { - int need_to_clean = e_route?0:1; - double latency; - e_route = e_route?e_route:(*(rc->get_route)) (rc, src, dst); - latency = base_vivaldi_get_latency(e_route->src_gateway,e_route->dst_gateway); - if(need_to_clean) generic_free_extended_route(e_route); - return latency; - } else { - return base_vivaldi_get_latency(src,dst); - } -} - /** * \brief Add a "host" to the network element list */ -static void parse_S_host(const char *host_id, const char* coord) -{ +static void parse_S_host(sg_platf_host_cbarg_t host) { network_element_info_t info = NULL; if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_BASE; - 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_assert(!xbt_lib_get_or_null(host_lib, host->id,ROUTING_HOST_LEVEL), + "Reading a host, processing unit \"%s\" already exists", + host->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, host_id); + "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_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_lib_set(host_lib,host->id,ROUTING_HOST_LEVEL,(void *) info); + if (host->coord && strcmp(host->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(host->coord, " "); xbt_dynar_shrink(ctn, 0); - xbt_lib_set(host_lib,host_id,COORD_HOST_LEVEL,(void *) ctn); + 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); - } -} - -/* - * \brief Add a host to the network element list from XML - */ -static void parse_S_host_XML(void) -{ - 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(const char *host_id, const char *coord) -{ - parse_S_host(host_id, coord); -} - - /** * \brief Add a "router" to the network element list */ -static void parse_S_router(const char *router_id) +static void parse_S_router(sg_platf_router_cbarg_t router) { network_element_info_t info = NULL; - if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_BASE; - 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(!xbt_lib_get_or_null(as_router_lib,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, - router_id); + "no defined method \"set_processing_unit\" in \"%s\"", + current_routing->name); + (*(current_routing->set_processing_unit)) (current_routing, router->id); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; - 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_lib_set(as_router_lib,router->id,ROUTING_ASR_LEVEL,(void *) info); + if (strcmp(router->coord,"")) { + if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); + xbt_dynar_t ctn = xbt_str_split_str(router->coord, " "); xbt_dynar_shrink(ctn, 0); - xbt_lib_set(as_router_lib,router_id,COORD_ASR_LEVEL,(void *) ctn); + 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 */ @@ -256,12 +158,12 @@ static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_ { if (src != NULL && dst != NULL && link_list != NULL) THROWF(arg_error, 0, "Route between %s to %s can not be defined", - src_id, dst_id); + src_id, dst_id); src = src_id; dst = dst_id; xbt_assert(strlen(src) > 0 || strlen(dst) > 0, - "Some limits are null in the route between \"%s\" and \"%s\"", - src, dst); + "Some limits are null in the route between \"%s\" and \"%s\"", + src, dst); link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } @@ -271,15 +173,7 @@ static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_ static void parse_S_route_new_and_endpoints_XML(void) { parse_S_route_new_and_endpoints(A_surfxml_route_src, - A_surfxml_route_dst); -} - -/** - * \brief Set the endpoints for a route from lua - */ -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); + A_surfxml_route_dst); } /** @@ -289,15 +183,15 @@ static void parse_S_ASroute_new_and_endpoints(void) { if (src != NULL && dst != NULL && link_list != NULL) THROWF(arg_error, 0, "Route between %s to %s can not be defined", - A_surfxml_ASroute_src, A_surfxml_ASroute_dst); + 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_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); + || strlen(gw_dst) > 0, + "Some limits are null in the route between \"%s\" and \"%s\"", + src, dst); link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } @@ -308,55 +202,38 @@ static void parse_S_bypassRoute_new_and_endpoints(void) { if (src != NULL && dst != NULL && link_list != NULL) THROWF(arg_error, 0, - "Bypass Route between %s to %s can not be defined", - A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst); + "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_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); + || strlen(gw_dst) > 0, + "Some limits are null in the route between \"%s\" and \"%s\"", + src, dst); link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } -/** - * \brief Set a new link on the actual list of link for a route or ASroute - */ -static void parse_E_link_ctn_new_elem(const char *link_id) -{ - char *val; - val = xbt_strdup(link_id); - xbt_dynar_push(link_list, &val); -} - /** * \brief Set a new link on the actual list of link for a route or ASroute from XML */ -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) { - 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); +static void routing_parse_link_ctn(void) +{ + char *link_id; + switch (A_surfxml_link_ctn_direction) { + case AU_surfxml_link_ctn_direction: + case A_surfxml_link_ctn_direction_NONE: + link_id = xbt_strdup(A_surfxml_link_ctn_id); + break; + case A_surfxml_link_ctn_direction_UP: + link_id = bprintf("%s_UP", A_surfxml_link_ctn_id); + break; + case A_surfxml_link_ctn_direction_DOWN: + link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_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(const char *link_id) -{ - parse_E_link_ctn_new_elem(link_id); + xbt_dynar_push(link_list,&link_id); } /** @@ -367,8 +244,8 @@ 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_assert(current_routing->set_route, - "no defined method \"set_route\" in \"%s\"", - current_routing->name); + "no defined method \"set_route\" in \"%s\"", + current_routing->name); (*(current_routing->set_route)) (current_routing, src, dst, route); link_list = NULL; src = NULL; @@ -385,8 +262,8 @@ static void parse_E_ASroute_store_route(void) e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); xbt_assert(current_routing->set_ASroute, - "no defined method \"set_ASroute\" in \"%s\"", - current_routing->name); + "no defined method \"set_ASroute\" in \"%s\"", + current_routing->name); (*(current_routing->set_ASroute)) (current_routing, src, dst, e_route); link_list = NULL; src = NULL; @@ -405,10 +282,10 @@ static void parse_E_bypassRoute_store_route(void) e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); xbt_assert(current_routing->set_bypassroute, - "no defined method \"set_bypassroute\" in \"%s\"", - current_routing->name); + "no defined method \"set_bypassroute\" in \"%s\"", + current_routing->name); (*(current_routing->set_bypassroute)) (current_routing, src, dst, - e_route); + e_route); link_list = NULL; src = NULL; dst = NULL; @@ -417,29 +294,37 @@ static void parse_E_bypassRoute_store_route(void) } /** - * \brief Make a new routing component + * \brief Make a new routing component to the platform + * + * Add a new autonomous system to the platform. Any elements (such as host, + * router or sub-AS) added after this call and before the corresponding call + * to sg_platf_new_AS_close() will be added to this AS. + * + * Once this function was called, the configuration concerning the used + * models cannot be changed anymore. * - * make the new structure and - * set the parsing functions to allows parsing the part of the routing tree + * @param AS_id name of this autonomous system. Must be unique in the platform + * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c */ -static void parse_S_AS(char *AS_id, char *AS_routing) +void routing_AS_open(const char *AS_id, const char *wanted_routing_type) { routing_component_t new_routing; model_type_t model = NULL; - char *wanted = AS_routing; int cpt; - /* seach the routing model */ + + surf_parse_models_setup(); /* ensure that the models are created after the last tag and before the first -like */ + + /* search the routing model */ for (cpt = 0; routing_models[cpt].name; cpt++) - if (!strcmp(wanted, routing_models[cpt].name)) + if (!strcmp(wanted_routing_type, routing_models[cpt].name)) model = &routing_models[cpt]; /* if its not exist, error */ if (model == NULL) { fprintf(stderr, "Routing model %s not found. Existing models:\n", - wanted); + wanted_routing_type); for (cpt = 0; routing_models[cpt].name; cpt++) - if (!strcmp(wanted, routing_models[cpt].name)) - fprintf(stderr, " %s: %s\n", routing_models[cpt].name, - routing_models[cpt].desc); + fprintf(stderr, " %s: %s\n", routing_models[cpt].name, + routing_models[cpt].desc); xbt_die(NULL); } @@ -450,10 +335,6 @@ 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 */ @@ -463,8 +344,8 @@ static void parse_S_AS(char *AS_id, char *AS_routing) } else if (current_routing != NULL && global_routing->root != NULL) { xbt_assert(!xbt_dict_get_or_null - (current_routing->routing_sons, AS_id), - "The AS \"%s\" already exists", AS_id); + (current_routing->routing_sons, 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 */ @@ -472,7 +353,7 @@ static void parse_S_AS(char *AS_id, char *AS_routing) current_routing->hierarchy = SURF_ROUTING_RECURSIVE; /* add to the sons dictionary */ xbt_dict_set(current_routing->routing_sons, AS_id, - (void *) new_routing, NULL); + (void *) new_routing, NULL); /* add to the father element list */ (*(current_routing->set_autonomous_system)) (current_routing, AS_id); /* unload the prev parse rules */ @@ -487,38 +368,25 @@ static void parse_S_AS(char *AS_id, char *AS_routing) current_routing = new_routing; } -/* - * Detect the routing model type of the routing component from XML platforms - */ -static void parse_S_AS_XML(void) -{ - parse_S_AS(A_surfxml_AS_id, A_surfxml_AS_routing); -} - -/* - * define the routing model type of routing component from lua script - */ -static void parse_S_AS_lua(char *id, char *mode) -{ - parse_S_AS(id, mode); -} - - /** - * \brief Finish the creation of a new routing component + * \brief Specify that the current description of AS is finished + * + * Once you've declared all the content of your AS, you have to close + * it with this call. Your AS is not usable until you call this function. + * + * @fixme: this call is not as robust as wanted: bad things WILL happen + * if you call it twice for the same AS, or if you forget calling it, or + * even if you add stuff to a closed AS * - * 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(const char *AS_id) -{ +void routing_AS_close() { if (current_routing == NULL) { - THROWF(arg_error, 0, "Close AS(%s), that never open", AS_id); + THROWF(arg_error, 0, "Close an AS, but none was under construction"); } else { network_element_info_t info = NULL; xbt_assert(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL), - "The AS \"%s\" already exists",current_routing->name); + "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; @@ -532,22 +400,6 @@ static void parse_E_AS(const char *AS_id) } } -/* - * \brief Finish the creation of a new routing component from XML - */ -static void parse_E_AS_XML(void) -{ - parse_E_AS(A_surfxml_AS_id); -} - -/* - * \brief Finish the creation of a new routing component from lua - */ -static void parse_E_AS_lua(const char *id) -{ - parse_E_AS(id); -} - /* Aux Business methods */ /** @@ -557,14 +409,14 @@ static void parse_E_AS_lua(const char *id) * */ 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; + xbt_lib_get_or_null(host_lib,name, ROUTING_HOST_LEVEL))->rc_component; return as_comp->name; -} + } /** @@ -576,257 +428,219 @@ static char* elements_As_name(const char *name) * Get the common father of the to processing units, and the first different * father in the chain */ -static xbt_dynar_t elements_father(const char *src, const char *dst) +static void elements_father(const char *src, const char *dst, + routing_component_t *res_father, + routing_component_t *res_src, + routing_component_t *res_dst) { - xbt_assert(src && dst, "bad parameters for \"elements_father\" method"); - - xbt_dynar_t result = xbt_dynar_new(sizeof(char *), NULL); - +#define ELEMENTS_FATHER_MAXDEPTH 16 /* increase if it is not enough */ routing_component_t src_as, dst_as; - int index_src, index_dst, index_father_src, index_father_dst; - xbt_dynar_t path_src = NULL; - xbt_dynar_t path_dst = NULL; - routing_component_t current = NULL; - routing_component_t *current_src = NULL; - routing_component_t *current_dst = NULL; - routing_component_t *father = NULL; + routing_component_t path_src[ELEMENTS_FATHER_MAXDEPTH]; + routing_component_t path_dst[ELEMENTS_FATHER_MAXDEPTH]; + int index_src = 0; + int index_dst = 0; + routing_component_t current; + routing_component_t current_src; + routing_component_t current_dst; + routing_component_t father; /* (1) find the as where the src and dst are located */ - 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); + network_element_info_t src_data = xbt_lib_get_or_null(host_lib, src, + ROUTING_HOST_LEVEL); + network_element_info_t 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 = src_data->rc_component; + dst_as = dst_data->rc_component; + + xbt_assert(src_as && dst_as, + "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst); /* (2) find the path to the root routing component */ - path_src = xbt_dynar_new(sizeof(routing_component_t), NULL); - current = src_as; - while (current != NULL) { - xbt_dynar_push(path_src, ¤t); - current = current->routing_father; + for (current = src_as ; current != NULL ; current = current->routing_father) { + if (index_src >= ELEMENTS_FATHER_MAXDEPTH) + xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_src"); + path_src[index_src++] = current; } - path_dst = xbt_dynar_new(sizeof(routing_component_t), NULL); - current = dst_as; - while (current != NULL) { - xbt_dynar_push(path_dst, ¤t); - current = current->routing_father; + for (current = dst_as ; current != NULL ; current = current->routing_father) { + if (index_dst >= ELEMENTS_FATHER_MAXDEPTH) + xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_dst"); + path_dst[index_dst++] = current; } /* (3) find the common father */ - index_src = path_src->used - 1; - index_dst = path_dst->used - 1; - current_src = xbt_dynar_get_ptr(path_src, index_src); - current_dst = xbt_dynar_get_ptr(path_dst, index_dst); - while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) { - current_src = xbt_dynar_get_ptr(path_src, index_src); - current_dst = xbt_dynar_get_ptr(path_dst, index_dst); - index_src--; - index_dst--; - } - index_src++; - index_dst++; - current_src = xbt_dynar_get_ptr(path_src, index_src); - current_dst = xbt_dynar_get_ptr(path_dst, index_dst); + do { + current_src = path_src[--index_src]; + current_dst = path_dst[--index_dst]; + } while (index_src > 0 && index_dst > 0 && current_src == current_dst); /* (4) they are not in the same routing component, make the path */ - index_father_src = index_src + 1; - index_father_dst = index_dst + 1; - - if (*current_src == *current_dst) + if (current_src == current_dst) father = current_src; else - father = xbt_dynar_get_ptr(path_src, index_father_src); + father = path_src[index_src + 1]; /* (5) result generation */ - xbt_dynar_push(result, father); /* first same the father of src and dst */ - xbt_dynar_push(result, current_src); /* second the first different father of src */ - xbt_dynar_push(result, current_dst); /* three the first different father of dst */ + *res_father = father; /* first the common father of src and dst */ + *res_src = current_src; /* second the first different father of src */ + *res_dst = current_dst; /* three the first different father of dst */ - xbt_dynar_free(&path_src); - xbt_dynar_free(&path_dst); - - return result; +#undef ELEMENTS_FATHER_MAXDEPTH } /* Global Business methods */ /** - * \brief Recursive function for get_route + * \brief Recursive function for get_route_latency * * \param src the source host name * \param dst the destination host name * \param *e_route the route where the links are stored + * \param *latency the latency, if needed * - * This function is called by "get_route". It allows to walk recursively - * through the routing components tree. + * This function is called by "get_route" and "get_latency". It allows to walk + * recursively through the routing components tree. */ -static void _get_route(const char *src, const char *dst,route_extended_t *e_route) +static void _get_route_latency(const char *src, const char *dst, + xbt_dynar_t *route, double *latency) { - XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); - xbt_assert(src && dst, "bad parameters for \"_get_route\" method"); - - xbt_dynar_t elem_father_list = elements_father(src, dst); + XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src, dst); + xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); - 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); + routing_component_t common_father; + routing_component_t src_father; + routing_component_t dst_father; + elements_father(src, dst, &common_father, &src_father, &dst_father); - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ + if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - (*e_route) = - (*(common_father->get_route)) (common_father, src, dst); - xbt_assert((*e_route), "no route between \"%s\" and \"%s\"", src, - dst); + route_extended_t e_route = NULL; + if (route) { + e_route = common_father->get_route(common_father, src, dst); + xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst); + *route = e_route->generic_route.link_list; + } + if (latency) { + *latency = common_father->get_latency(common_father, src, dst, e_route); + xbt_assert(*latency >= 0.0, + "latency error on route between \"%s\" and \"%s\"", src, dst); + } + if (e_route) { + xbt_free(e_route->src_gateway); + xbt_free(e_route->dst_gateway); + xbt_free(e_route); + } } else { /* SURF_ROUTING_RECURSIVE */ - void *link; - unsigned int cpt = 0; - - route_extended_t e_route_cnt = NULL; - route_extended_t e_route_src = NULL; - route_extended_t e_route_dst = NULL; route_extended_t e_route_bypass = NULL; - - (*e_route) = xbt_new0(s_route_extended_t, 1); - (*e_route)->src_gateway = NULL; - (*e_route)->dst_gateway = NULL; - (*e_route)->generic_route.link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - if (common_father->get_bypass_route) - e_route_bypass = - (*(common_father->get_bypass_route)) (common_father, src, dst); + e_route_bypass = common_father->get_bypass_route(common_father, src, dst); - if (e_route_bypass) - e_route_cnt = e_route_bypass; - else - e_route_cnt = - (*(common_father->get_route)) (common_father, src_father->name, - dst_father->name); + xbt_assert(!latency || !e_route_bypass, + "Bypass cannot work yet with get_latency"); - xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", + route_extended_t e_route_cnt = e_route_bypass + ? e_route_bypass + : 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); + (e_route_cnt->dst_gateway == NULL), + "bad gateway for route between \"%s\" and \"%s\"", src, dst); + + if (route) { + *route = xbt_dynar_new(global_routing->size_of_link, NULL); + } + if (latency) { + *latency = common_father->get_latency(common_father, + src_father->name, dst_father->name, + e_route_cnt); + xbt_assert(*latency >= 0.0, + "latency error on route between \"%s\" and \"%s\"", + src_father->name, dst_father->name); + } + + void *link; + unsigned int cpt; if (strcmp(src, e_route_cnt->src_gateway)) { - _get_route(src, e_route_cnt->src_gateway, &e_route_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); + double latency_src; + xbt_dynar_t route_src; + + _get_route_latency(src, e_route_cnt->src_gateway, + (route ? &route_src : NULL), + (latency ? &latency_src : NULL)); + if (route) { + xbt_assert(route_src, "no route between \"%s\" and \"%s\"", + src, e_route_cnt->src_gateway); + xbt_dynar_foreach(route_src, cpt, link) { + xbt_dynar_push(*route, &link); + } + xbt_dynar_free(&route_src); + } + if (latency) { + xbt_assert(latency_src >= 0.0, + "latency error on route between \"%s\" and \"%s\"", + src, e_route_cnt->src_gateway); + *latency += latency_src; } } - xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { - xbt_dynar_push((*e_route)->generic_route.link_list, &link); + if (route) { + xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { + xbt_dynar_push(*route, &link); + } } if (strcmp(e_route_cnt->dst_gateway, dst)) { - _get_route(e_route_cnt->dst_gateway, dst, &e_route_dst); - 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); + double latency_dst; + xbt_dynar_t route_dst; + + _get_route_latency(e_route_cnt->dst_gateway, dst, + (route ? &route_dst : NULL), + (latency ? &latency_dst : NULL)); + if (route) { + xbt_assert(route_dst, "no route between \"%s\" and \"%s\"", + e_route_cnt->dst_gateway, dst); + xbt_dynar_foreach(route_dst, cpt, link) { + xbt_dynar_push(*route, &link); + } + xbt_dynar_free(&route_dst); + } + if (latency) { + xbt_assert(latency_dst >= 0.0, + "latency error on route between \"%s\" and \"%s\"", + e_route_cnt->dst_gateway, dst); + *latency += latency_dst; } } - (*e_route)->src_gateway = xbt_strdup(e_route_cnt->src_gateway); - (*e_route)->dst_gateway = xbt_strdup(e_route_cnt->dst_gateway); - - generic_free_extended_route(e_route_src); generic_free_extended_route(e_route_cnt); - generic_free_extended_route(e_route_dst); } - - xbt_dynar_free(&elem_father_list); } -static double _get_latency(const char *src, const char *dst) +/** + * \brief Generic function for get_route, get_route_no_cleanup, and get_latency + */ +static void get_route_latency(const char *src, const char *dst, + xbt_dynar_t *route, double *latency, int cleanup) { - 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 */ - - latency = - (*(common_father->get_latency)) (common_father, src, dst, NULL); - xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", src, - dst); - - } 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, src_father->name, dst_father->name, e_route_cnt); - - xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", - src_father->name, dst_father->name); - - if (strcmp(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 (strcmp(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; - } - + _get_route_latency(src, dst, route, latency); + xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst); + xbt_assert(!latency || *latency >= 0.0, + "latency error on route between \"%s\" and \"%s\"", src, dst); + if (route) { + xbt_dynar_free(&global_routing->last_route); + global_routing->last_route = cleanup ? *route : NULL; } - - xbt_dynar_free(&elem_father_list); - - return latency; } /** @@ -841,24 +655,30 @@ static double _get_latency(const char *src, const char *dst) */ static xbt_dynar_t get_route(const char *src, const char *dst) { + xbt_dynar_t route = NULL; + get_route_latency(src, dst, &route, NULL, 1); + return route; +} - route_extended_t e_route = NULL; - - _get_route(src, dst, &e_route); - xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst); - - if (global_routing->last_route) - xbt_dynar_free(&(global_routing->last_route)); - global_routing->last_route = e_route->generic_route.link_list; - - if (e_route->src_gateway) - xbt_free(e_route->src_gateway); - if (e_route->dst_gateway) - xbt_free(e_route->dst_gateway); - - xbt_free(e_route); - - return global_routing->last_route; +/** + * \brief Generic method: find a route between hosts + * + * \param src the source host name + * \param dst the destination host name + * + * same as get_route, but return NULL if any exception is raised. + */ +static xbt_dynar_t get_route_or_null(const char *src, const char *dst) +{ + xbt_dynar_t route = NULL; + xbt_ex_t exception; + TRY { + get_route_latency(src, dst, &route, NULL, 1); + }CATCH(exception) { + xbt_ex_free(exception); + return NULL; + } + return route; } /** @@ -873,21 +693,32 @@ static xbt_dynar_t get_route(const char *src, const char *dst) */ static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst) { - xbt_dynar_t d = get_route(src,dst); - global_routing->last_route = NULL; - return d; + xbt_dynar_t route = NULL; + get_route_latency(src, dst, &route, NULL, 0); + return route; } /*Get Latency*/ static double get_latency(const char *src, const char *dst) { - double latency = -1.0; - latency = _get_latency(src, dst); - xbt_assert(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst); + get_route_latency(src, dst, NULL, &latency, 0); return latency; } +static int surf_parse_models_setup_already_called=0; +/* Call the last initialization functions, that must be called after the + * tag, if any, and before the first of cluster|peer|AS|trace|trace_connect + */ +void surf_parse_models_setup() +{ + if (surf_parse_models_setup_already_called) + return; + surf_parse_models_setup_already_called=1; + surf_config_models_setup(); +} + + /** * \brief Recursive function for finalize * @@ -910,7 +741,7 @@ static void _finalize(routing_component_t rc) xbt_dict_free(&tmp_sons); xbt_free(tmp_name); xbt_assert(rc->finalize, "no defined method \"finalize\" in \"%s\"", - current_routing->name); + current_routing->name); (*(rc->finalize)) (rc); } } @@ -923,12 +754,14 @@ static void _finalize(routing_component_t rc) */ static void finalize(void) { - /* delete recursibly all the tree */ + /* delete recursively all the tree */ _finalize(global_routing->root); /* delete last_route */ xbt_dynar_free(&(global_routing->last_route)); /* delete global routing structure */ xbt_free(global_routing); + /* make sure that we will reinit the models while loading the platf once reinited -- HACK but there is no proper surf_routing_init() */ + surf_parse_models_setup_already_called = 0; } static xbt_dynar_t recursive_get_onelink_routes(routing_component_t rc) @@ -965,7 +798,7 @@ static xbt_dynar_t get_onelink_routes(void) } e_surf_network_element_type_t get_network_element_type(const char - *name) + *name) { network_element_info_t rc = NULL; @@ -989,9 +822,11 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ global_routing = xbt_new0(s_routing_global_t, 1); global_routing->root = NULL; global_routing->get_route = get_route; + global_routing->get_route_or_null = get_route_or_null; 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_route_latency = get_route_latency; global_routing->get_network_element_type = get_network_element_type; global_routing->finalize = finalize; global_routing->loopback = loopback; @@ -1000,63 +835,41 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ get_link_latency = get_link_latency_fun; /* no current routing at moment */ current_routing = NULL; +} + +void routing_register_callbacks() { + sg_platf_host_add_cb(parse_S_host); + sg_platf_router_add_cb(parse_S_router); - /* parse generic elements */ - surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML); - 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_random_cb_list, &routing_parse_Srandom); surfxml_add_callback(STag_surfxml_route_cb_list, - &parse_S_route_new_and_endpoints_XML); + &parse_S_route_new_and_endpoints_XML); surfxml_add_callback(STag_surfxml_ASroute_cb_list, - &parse_S_ASroute_new_and_endpoints); + &parse_S_ASroute_new_and_endpoints); surfxml_add_callback(STag_surfxml_bypassRoute_cb_list, - &parse_S_bypassRoute_new_and_endpoints); + &parse_S_bypassRoute_new_and_endpoints); - surfxml_add_callback(ETag_surfxml_link_ctn_cb_list, - &parse_E_link_ctn_new_elem_XML); + surfxml_add_callback(ETag_surfxml_link_ctn_cb_list, &routing_parse_link_ctn); surfxml_add_callback(ETag_surfxml_route_cb_list, - &parse_E_route_store_route); + &parse_E_route_store_route); surfxml_add_callback(ETag_surfxml_ASroute_cb_list, - &parse_E_ASroute_store_route); + &parse_E_ASroute_store_route); surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, - &parse_E_bypassRoute_store_route); - - surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS_XML); - surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML); + &parse_E_bypassRoute_store_route); surfxml_add_callback(STag_surfxml_cluster_cb_list, - &routing_parse_Scluster); + &routing_parse_Scluster); - surfxml_add_callback(STag_surfxml_peer_cb_list, - &routing_parse_Speer); - - surfxml_add_callback(ETag_surfxml_platform_cb_list, - &clean_dict_random); + sg_platf_peer_add_cb(routing_parse_Speer); // FIXME: inline in the sg_platf_new_peer instead + sg_platf_postparse_add_cb(clean_routing_after_parse); #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); -} - /* ************************************************** */ /* ********** PATERN FOR NEW ROUTING **************** */ @@ -1104,7 +917,7 @@ void surf_parse_models_setup() /* ************************* GENERIC PARSE FUNCTIONS ************************ */ void generic_set_processing_unit(routing_component_t rc, - const char *name) + const char *name) { XBT_DEBUG("Load process unit \"%s\"", name); int *id = xbt_new0(int, 1); @@ -1115,7 +928,7 @@ void generic_set_processing_unit(routing_component_t rc, } void generic_set_autonomous_system(routing_component_t rc, - const char *name) + const char *name) { XBT_DEBUG("Load Autonomous system \"%s\"", name); int *id = xbt_new0(int, 1); @@ -1136,8 +949,8 @@ int surf_link_resource_cmp(const void *a, const void *b) } void generic_set_bypassroute(routing_component_t rc, - const char *src, const char *dst, - route_extended_t e_route) + const char *src, const char *dst, + route_extended_t e_route) { XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst); xbt_dict_t dict_bypassRoutes = rc->bypassRoutes; @@ -1145,11 +958,11 @@ void generic_set_bypassroute(routing_component_t rc, route_name = bprintf("%s#%s", src, dst); 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); + "Invalid count of links, must be greater than zero (%s,%s)", + src, dst); 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); + "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 = generic_new_extended_route(SURF_ROUTING_RECURSIVE, e_route, 0); @@ -1157,7 +970,7 @@ void generic_set_bypassroute(routing_component_t rc, xbt_free(e_route); xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, - (void (*)(void *)) generic_free_extended_route); + (void (*)(void *)) generic_free_extended_route); xbt_free(route_name); } @@ -1165,20 +978,20 @@ void generic_set_bypassroute(routing_component_t rc, /* *********************** GENERIC BUSINESS METHODS ************************* */ double generic_get_link_latency(routing_component_t rc, - const char *src, const char *dst, - route_extended_t route) + const char *src, const char *dst, + route_extended_t route) { - int need_to_clean = route?0:1; - void * link; - unsigned int i; - double latency = 0.0; + int need_to_clean = route?0:1; + void * link; + unsigned int i; + double latency = 0.0; - route = route?route:rc->get_route(rc,src,dst); + route = route?route:rc->get_route(rc,src,dst); - xbt_dynar_foreach(route->generic_route.link_list,i,link) { - latency += get_link_latency(link); - } - if(need_to_clean) generic_free_extended_route(route); + xbt_dynar_foreach(route->generic_route.link_list,i,link) { + latency += get_link_latency(link); + } + if(need_to_clean) generic_free_extended_route(route); return latency; } @@ -1188,8 +1001,8 @@ xbt_dynar_t generic_get_onelink_routes(routing_component_t rc) } route_extended_t generic_get_bypassroute(routing_component_t rc, - const char *src, - const char *dst) + const char *src, + const char *dst) { xbt_dict_t dict_bypassRoutes = rc->bypassRoutes; routing_component_t src_as, dst_as; @@ -1207,8 +1020,8 @@ route_extended_t generic_get_bypassroute(routing_component_t rc, 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); + 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; @@ -1233,9 +1046,8 @@ route_extended_t generic_get_bypassroute(routing_component_t rc, current_src = xbt_dynar_get_ptr(path_src, index_src); current_dst = xbt_dynar_get_ptr(path_dst, index_dst); while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) { - routing_component_t *tmp_src, *tmp_dst; - tmp_src = xbt_dynar_pop_ptr(path_src); - tmp_dst = xbt_dynar_pop_ptr(path_dst); + xbt_dynar_pop_ptr(path_src); + xbt_dynar_pop_ptr(path_dst); index_src--; index_dst--; current_src = xbt_dynar_get_ptr(path_src, index_src); @@ -1254,12 +1066,12 @@ route_extended_t generic_get_bypassroute(routing_component_t rc, for (i = 0; i < max; i++) { if (i <= max_index_src && max <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_src, i)))->name, - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_dst, max)))->name); + (*(routing_component_t *) + (xbt_dynar_get_ptr + (path_src, i)))->name, + (*(routing_component_t *) + (xbt_dynar_get_ptr + (path_dst, max)))->name); e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); @@ -1268,12 +1080,12 @@ route_extended_t generic_get_bypassroute(routing_component_t rc, break; if (max <= max_index_src && i <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_src, max)))->name, - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_dst, i)))->name); + (*(routing_component_t *) + (xbt_dynar_get_ptr + (path_src, max)))->name, + (*(routing_component_t *) + (xbt_dynar_get_ptr + (path_dst, i)))->name); e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); @@ -1287,12 +1099,12 @@ route_extended_t generic_get_bypassroute(routing_component_t rc, if (max <= max_index_src && max <= max_index_dst) { char *route_name = bprintf("%s#%s", - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_src, max)))->name, - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_dst, max)))->name); + (*(routing_component_t *) + (xbt_dynar_get_ptr + (path_src, max)))->name, + (*(routing_component_t *) + (xbt_dynar_get_ptr + (path_dst, max)))->name); e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name); xbt_free(route_name); } @@ -1326,7 +1138,7 @@ route_extended_t generic_get_bypassroute(routing_component_t rc, route_t generic_new_route(e_surf_routing_hierarchy_t hierarchy, - void *data, int order) + void *data, int order) { char *link_name; @@ -1339,7 +1151,7 @@ generic_new_route(e_surf_routing_hierarchy_t hierarchy, xbt_dynar_new(global_routing->size_of_link, NULL); xbt_assert(hierarchy == SURF_ROUTING_BASE, - "the hierarchy type is not SURF_ROUTING_BASE"); + "the hierarchy type is not SURF_ROUTING_BASE"); links = ((route_t) data)->link_list; @@ -1349,7 +1161,7 @@ generic_new_route(e_surf_routing_hierarchy_t hierarchy, xbt_dynar_foreach(links, cpt, link_name) { void *link = - xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); if (link) { if (order) xbt_dynar_push(links_id, &link); @@ -1364,7 +1176,7 @@ generic_new_route(e_surf_routing_hierarchy_t hierarchy, route_extended_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, - void *data, int order) + void *data, int order) { char *link_name; @@ -1380,8 +1192,8 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, new_e_route->dst_gateway = NULL; xbt_assert(hierarchy == SURF_ROUTING_BASE - || hierarchy == SURF_ROUTING_RECURSIVE, - "the hierarchy type is not defined"); + || hierarchy == SURF_ROUTING_RECURSIVE, + "the hierarchy type is not defined"); if (hierarchy == SURF_ROUTING_BASE) { @@ -1392,7 +1204,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, e_route = (route_extended_t) data; xbt_assert(e_route->src_gateway - && e_route->dst_gateway, "bad gateway, is null"); + && e_route->dst_gateway, "bad gateway, is null"); links = e_route->generic_route.link_list; /* remeber not erase the gateway names */ @@ -1405,7 +1217,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, xbt_dynar_foreach(links, cpt, link_name) { void *link = - xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); if (link) { if (order) xbt_dynar_push(links_id, &link); @@ -1439,7 +1251,7 @@ void generic_free_extended_route(route_extended_t e_route) } static routing_component_t generic_as_exist(routing_component_t find_from, - routing_component_t to_find) + routing_component_t to_find) { //return to_find; // FIXME: BYPASSERROR OF FOREACH WITH BREAK xbt_dict_cursor_t cursor = NULL; @@ -1465,7 +1277,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_lib_get_or_null(as_router_lib, element, ROUTING_ASR_LEVEL))->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); @@ -1488,15 +1300,15 @@ generic_processing_units_exist(routing_component_t rc, char *element) { routing_component_t element_as; element_as = ((network_element_info_t) - xbt_lib_get_or_null(host_lib, - element, ROUTING_HOST_LEVEL))->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); } void generic_src_dst_check(routing_component_t rc, const char *src, - const char *dst) + const char *dst) { void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL); @@ -1505,298 +1317,277 @@ void generic_src_dst_check(routing_component_t rc, const char *src, 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); + 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_die("The src(%s in %s) and dst(%s in %s) are in differents AS", + src, src_as->name, dst, 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); + 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) -{ - XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); -} - -static void routing_parse_Econfig(void) -{ - xbt_dict_cursor_t cursor = NULL; - char *key; - char *elem; - char *cfg; - xbt_dict_foreach(current_property_set, cursor, 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); -} - -void routing_parse_Scluster(void) -{ - static int AX_ptr = 0; - - char *cluster_id = A_surfxml_cluster_id; - char *cluster_prefix = A_surfxml_cluster_prefix; - char *cluster_suffix = A_surfxml_cluster_suffix; - char *cluster_radical = A_surfxml_cluster_radical; - char *cluster_power = A_surfxml_cluster_power; - char *cluster_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; +void routing_parse_Scluster(void) { char *host_id, *groups, *link_id = NULL; - char *router_id, *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); + s_sg_platf_host_cbarg_t host; + s_sg_platf_link_cbarg_t link; + + if( strcmp(struct_cluster->availability_trace,"") + || strcmp(struct_cluster->state_trace,"") ) + { + if(xbt_dict_size(patterns)==0) + patterns = xbt_dict_new(); + xbt_dict_set(patterns,"id",xbt_strdup(struct_cluster->id),free); + xbt_dict_set(patterns,"prefix",xbt_strdup(struct_cluster->prefix),free); + xbt_dict_set(patterns,"suffix",xbt_strdup(struct_cluster->suffix),free); + } -#ifdef HAVE_PCRE_LIB - char *route_src_dst; -#endif unsigned int iter; int start, end, i; xbt_dynar_t radical_elements; xbt_dynar_t radical_ends; - int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy; - int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy; - -#ifndef HAVE_PCRE_LIB - xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL); - char *route_src, *route_dst; - int j; -#endif - - 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, cluster_id); -#ifdef HAVE_PCRE_LIB - SURFXML_BUFFER_SET(AS_routing, "RuleBased"); - XBT_DEBUG("", cluster_id); -#else - SURFXML_BUFFER_SET(AS_routing, "Full"); - XBT_DEBUG("", cluster_id); -#endif - SURFXML_START_TAG(AS); + XBT_DEBUG("", struct_cluster->id); + sg_platf_new_AS_open(struct_cluster->id,"Cluster"); - radical_elements = xbt_str_split(cluster_radical, ","); + //Make all hosts + radical_elements = xbt_str_split(struct_cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { + memset(&host,0,sizeof(host)); + radical_ends = xbt_str_split(groups, "-"); switch (xbt_dynar_length(radical_ends)) { case 1: - surf_parse_get_int(&start, - xbt_dynar_get_as(radical_ends, 0, char *)); - host_id = bprintf("%s%d%s", cluster_prefix, start, cluster_suffix); -#ifndef HAVE_PCRE_LIB - xbt_dynar_push_as(tab_elements_num, int, start); -#endif - link_id = bprintf("%s_link_%d", cluster_id, start); - - 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, temp_cluster_power); - SURFXML_BUFFER_SET(host_core, cluster_core); - SURFXML_BUFFER_SET(host_availability, "1.0"); - 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)); + start=surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); + host_id = bprintf("%s%d%s", struct_cluster->prefix, start, struct_cluster->suffix); + link_id = bprintf("%s_link_%d", struct_cluster->id, start); + + XBT_DEBUG("", host_id, struct_cluster->power); + host.id = host_id; + if(strcmp(struct_cluster->availability_trace,"")){ + xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free); + char* tmp_availability_file = xbt_strdup(struct_cluster->availability_trace); + xbt_str_varsubst(tmp_availability_file,patterns); + XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file); + host.power_trace = tmgr_trace_new(tmp_availability_file); + xbt_free(tmp_availability_file); + } + else + { + XBT_DEBUG("\tavailability_file=\"\""); + } + if(strcmp(struct_cluster->state_trace,"")){ + char *tmp_state_file = xbt_strdup(struct_cluster->state_trace); + xbt_str_varsubst(tmp_state_file,patterns); + XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file); + host.state_trace = tmgr_trace_new(tmp_state_file); + xbt_free(tmp_state_file); + } + else + { + XBT_DEBUG("\tstate_file=\"\""); + } + + host.power_peak = struct_cluster->power; + host.power_scale = 1.0; + host.core_amount = struct_cluster->core_amount; + host.initial_state = SURF_RESOURCE_ON; + host.coord = ""; + sg_platf_new_host(&host); XBT_DEBUG(""); - SURFXML_START_TAG(host); - SURFXML_END_TAG(host); - - - 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) - {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} - 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, 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: - 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++) { - host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix); -#ifndef HAVE_PCRE_LIB - xbt_dynar_push_as(tab_elements_num, int, i); -#endif - link_id = bprintf("%s_link_%d", cluster_id, i); - - 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, temp_cluster_power); - SURFXML_BUFFER_SET(host_core, cluster_core); - SURFXML_BUFFER_SET(host_availability, "1.0"); - 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); - - 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) - {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} - 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, 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); + XBT_DEBUG("", link_id,struct_cluster->bw, struct_cluster->lat); + + memset(&link,0,sizeof(link)); + link.id = link_id; + link.bandwidth = struct_cluster->bw; + link.latency = struct_cluster->lat; + link.state = SURF_RESOURCE_ON; + + switch (struct_cluster->sharing_policy) { + case A_surfxml_cluster_sharing_policy_FATPIPE: + link.policy = SURF_LINK_FATPIPE; + break; + case A_surfxml_cluster_sharing_policy_FULLDUPLEX: + link.policy = SURF_LINK_FULLDUPLEX; + break; + default: + link.policy = SURF_LINK_SHARED; + } + + sg_platf_new_link(&link); + + surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1); + if (struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX){ + char* tmp_link = bprintf("%s_UP",link_id); + info->link_up = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); + free(tmp_link); + tmp_link = bprintf("%s_DOWN",link_id); + info->link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); + free(tmp_link); + } + else{ + info->link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL); + info->link_down = info->link_up; } + surf_routing_cluster_add_link(host_id,info); + xbt_free(link_id); + xbt_free(host_id); + break; - default: - XBT_DEBUG("Malformed radical"); + case 2: + + start=surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); + end= surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); + for (i = start; i <= end; i++) { + host_id = bprintf("%s%d%s", struct_cluster->prefix, i, struct_cluster->suffix); + link_id = bprintf("%s_link_%d", struct_cluster->id, i); + + XBT_DEBUG("", host_id, struct_cluster->power); + host.id = host_id; + if(strcmp(struct_cluster->availability_trace,"")){ + xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free); + char* tmp_availability_file = xbt_strdup(struct_cluster->availability_trace); + xbt_str_varsubst(tmp_availability_file,patterns); + XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file); + host.power_trace = tmgr_trace_new(tmp_availability_file); + xbt_free(tmp_availability_file); + } + else + { + XBT_DEBUG("\tavailability_file=\"\""); + } + if(strcmp(struct_cluster->state_trace,"")){ + char *tmp_state_file = xbt_strdup(struct_cluster->state_trace); + xbt_str_varsubst(tmp_state_file,patterns); + XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file); + host.state_trace = tmgr_trace_new(tmp_state_file); + xbt_free(tmp_state_file); + } + else + { + XBT_DEBUG("\tstate_file=\"\""); + } + + host.power_peak = struct_cluster->power; + host.power_scale = 1.0; + host.core_amount = struct_cluster->core_amount; + host.initial_state = SURF_RESOURCE_ON; + host.coord = ""; + sg_platf_new_host(&host); + XBT_DEBUG(""); + + XBT_DEBUG("", link_id,struct_cluster->bw, struct_cluster->lat); + + memset(&link,0,sizeof(link)); + link.id = link_id; + link.bandwidth = struct_cluster->bw; + link.latency = struct_cluster->lat; + link.state = SURF_RESOURCE_ON; + + switch (struct_cluster->sharing_policy) { + case A_surfxml_cluster_sharing_policy_SHARED: + link.policy = SURF_LINK_SHARED; + break; + case A_surfxml_cluster_sharing_policy_FULLDUPLEX: + link.policy = SURF_LINK_FULLDUPLEX; + break; + case A_surfxml_cluster_sharing_policy_FATPIPE: + link.policy = SURF_LINK_FATPIPE; + break; + default: + surf_parse_error(bprintf("Invalid cluster sharing policy for cluster %s",struct_cluster->id)); + } + sg_platf_new_link(&link); + + surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1); + if (link.policy == SURF_LINK_FULLDUPLEX) { + char* tmp_link = bprintf("%s_UP",link_id); + info->link_up = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); + free(tmp_link); + tmp_link = bprintf("%s_DOWN",link_id); + info->link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); + free(tmp_link); + } + else{ + info->link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL); + info->link_down = info->link_up; + } + surf_routing_cluster_add_link(host_id,info); + + xbt_free(link_id); + xbt_free(host_id); + + } + break; + + default: + XBT_DEBUG("Malformed radical"); + break; } xbt_dynar_free(&radical_ends); } xbt_dynar_free(&radical_elements); + // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, and it's very useful to connect clusters together 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); - - XBT_DEBUG("", router_id); - SURFXML_BUFFER_SET(router_id, router_id); - SURFXML_BUFFER_SET(router_coordinates, ""); - SURFXML_START_TAG(router); - SURFXML_END_TAG(router); - - //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) -// {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} -// 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, 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_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) - {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} - SURFXML_BUFFER_SET(link_id, link_backbone); - SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw); - SURFXML_BUFFER_SET(link_latency, cluster_bb_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("", struct_cluster->router_id); + s_sg_platf_router_cbarg_t router; + char *newid=NULL; + memset(&router,0,sizeof(router)); + router.id = struct_cluster->router_id; + router.coord = ""; + if (!router.id || !strcmp(router.id,"")) + router.id = newid = bprintf("%s%s_router%s", struct_cluster->prefix, struct_cluster->id, struct_cluster->suffix); + sg_platf_new_router(&router); + if (newid) + free(newid); + + //Make the backbone + if( (struct_cluster->bb_bw!= 0) && (struct_cluster->bb_lat!=0) ){ + char *link_backbone = bprintf("%s_backbone", struct_cluster->id); + XBT_DEBUG("", link_backbone,struct_cluster->bb_bw, struct_cluster->bb_lat); + + memset(&link,0,sizeof(link)); + link.id = link_backbone; + link.bandwidth = struct_cluster->bb_bw; + link.latency = struct_cluster->bb_lat; + link.state = SURF_RESOURCE_ON; + + switch (struct_cluster->bb_sharing_policy) { + case A_surfxml_cluster_bb_sharing_policy_FATPIPE: + link.policy = SURF_LINK_FATPIPE; + break; + case A_surfxml_cluster_bb_sharing_policy_SHARED: + link.policy = SURF_LINK_SHARED; + break; + default: + surf_parse_error(bprintf("Invalid bb sharing policy in cluster %s",struct_cluster->id)); + } + + sg_platf_new_link(&link); + + surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1); + info->link_up = xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL); + info->link_down = info->link_up; + surf_routing_cluster_add_link(struct_cluster->id, info); + + free(link_backbone); + } XBT_DEBUG(" "); -#ifdef HAVE_PCRE_LIB char *new_suffix = xbt_strdup(""); - radical_elements = xbt_str_split(cluster_suffix, "."); + radical_elements = xbt_str_split(struct_cluster->suffix, "."); xbt_dynar_foreach(radical_elements, iter, groups) { if (strcmp(groups, "")) { char *old_suffix = new_suffix; @@ -1804,207 +1595,24 @@ void routing_parse_Scluster(void) free(old_suffix); } } - route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix); - xbt_dynar_free(&radical_elements); - free(new_suffix); - - 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); - - //from router to router - XBT_DEBUG(""); - SURFXML_BUFFER_SET(route_src, router_id); - SURFXML_BUFFER_SET(route_dst, router_id); - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; - SURFXML_START_TAG(route); - - 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); - - XBT_DEBUG(""); - SURFXML_END_TAG(route); - - //from host to router - XBT_DEBUG(""); - SURFXML_BUFFER_SET(route_src, route_src_dst); - SURFXML_BUFFER_SET(route_dst, router_id); - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; - SURFXML_START_TAG(route); - - 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); - - 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); - - XBT_DEBUG(""); - SURFXML_END_TAG(route); - - //from router to host - XBT_DEBUG(""); - SURFXML_BUFFER_SET(route_src, router_id); - SURFXML_BUFFER_SET(route_dst, route_src_dst); - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; - SURFXML_START_TAG(route); - - 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); - - 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_UP;} - SURFXML_START_TAG(link_ctn); - SURFXML_END_TAG(link_ctn); - - XBT_DEBUG(""); - SURFXML_END_TAG(route); - - //from host to host - XBT_DEBUG(""); - SURFXML_BUFFER_SET(route_src, route_src_dst); - SURFXML_BUFFER_SET(route_dst, route_src_dst); - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; - SURFXML_START_TAG(route); - - 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); - - 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); - - 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); - - 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++) { - if (i == xbt_dynar_length(tab_elements_num)) { - route_src = router_id; - } else { - route_src = - bprintf("%s%d%s", cluster_prefix, - xbt_dynar_get_as(tab_elements_num, i, int), - cluster_suffix); - } - - if (j == xbt_dynar_length(tab_elements_num)) { - route_dst = router_id; - } else { - route_dst = - bprintf("%s%d%s", cluster_prefix, - xbt_dynar_get_as(tab_elements_num, j, int), - cluster_suffix); - } - - XBT_DEBUG(""); - SURFXML_BUFFER_SET(route_src, route_src); - SURFXML_BUFFER_SET(route_dst, route_dst); - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; - SURFXML_START_TAG(route); - - if (i != xbt_dynar_length(tab_elements_num)){ - route_src = - bprintf("%s_link_%d", cluster_id, - xbt_dynar_get_as(tab_elements_num, i, int)); - 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) - {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;} - SURFXML_START_TAG(link_ctn); - SURFXML_END_TAG(link_ctn); - free(route_src); - } - - 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); - - if (j != xbt_dynar_length(tab_elements_num)) { - route_dst = - bprintf("%s_link_%d", cluster_id, - xbt_dynar_get_as(tab_elements_num, j, int)); - 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) - {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;} - SURFXML_START_TAG(link_ctn); - SURFXML_END_TAG(link_ctn); - free(route_dst); - } - - XBT_DEBUG(""); - SURFXML_END_TAG(route); - } - } - xbt_dynar_free(&tab_elements_num); -#endif + xbt_dynar_free(&radical_elements); + xbt_free(new_suffix); - free(router_id); - free(link_backbone); - //free(link_router); - xbt_dict_free(&patterns); - free(availability_file); - free(state_file); + if( strcmp(struct_cluster->availability_trace,"") + || strcmp(struct_cluster->state_trace,"") ) + xbt_dict_free(&patterns); XBT_DEBUG(""); - SURFXML_END_TAG(AS); + sg_platf_new_AS_close(); 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) @@ -2019,29 +1627,19 @@ static char* replace_random_parameter(char * string) string = test_string; } //In other case take old value (without ${}) else - free(test_string); + free(test_string); return string; -} + } -static void clean_dict_random(void) +static void clean_routing_after_parse(void) { - xbt_dict_free(&random_value); - xbt_dict_free(&patterns); + xbt_dict_free(&random_value); + xbt_dict_free(&patterns); } -static void routing_parse_Speer(void) +static void routing_parse_Speer(sg_platf_peer_cbarg_t peer) { 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; @@ -2052,62 +1650,53 @@ static void routing_parse_Speer(void) 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("", peer->id); + sg_platf_new_AS_open(peer->id, "Full"); 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); + host_id = HOST_PEER(peer->id); + router_id = ROUTER_PEER(peer->id); + link_id_up = LINK_UP_PEER(peer->id); + link_id_down = LINK_DOWN_PEER(peer->id); + + link_router = bprintf("%s_link_router", peer->id); + link_backbone = bprintf("%s_backbone", peer->id); + + XBT_DEBUG("", host_id, peer->power); + s_sg_platf_host_cbarg_t host; + memset(&host,0,sizeof(host)); + host.initial_state = SURF_RESOURCE_ON; + host.id = host_id; + host.power_peak = peer->power; + host.power_scale = 1.0; + host.power_trace = peer->availability_trace; + host.state_trace = peer->state_trace; + host.core_amount = 1; + sg_platf_new_host(&host); + + + XBT_DEBUG("", router_id, peer->coord); + s_sg_platf_router_cbarg_t router; + memset(&router,0,sizeof(router)); + router.id = router_id; + router.coord = peer->coord; + sg_platf_new_router(&router); + + XBT_DEBUG("", link_id_up, peer->bw_in, peer->lat); + s_sg_platf_link_cbarg_t link; + memset(&link,0,sizeof(link)); + link.state = SURF_RESOURCE_ON; + link.policy = SURF_LINK_SHARED; + link.id = link_id_up; + link.bandwidth = peer->bw_in; + link.latency = peer->lat; + sg_platf_new_link(&link); + + // FIXME: dealing with full duplex is not the role of this piece of code, I'd say [Mt] + // Instead, it should be created fullduplex, and the models will do what's needed in this case + XBT_DEBUG("", link_id_down, peer->bw_out, peer->lat); + link.id = link_id_down; + sg_platf_new_link(&link); XBT_DEBUG(" "); @@ -2146,187 +1735,122 @@ static void routing_parse_Speer(void) SURFXML_END_TAG(route); XBT_DEBUG(""); - SURFXML_END_TAG(AS); + sg_platf_new_AS_close(); 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); + 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); - } - -} - + double mean, std, min, max, seed; + char *random_id = A_surfxml_random_id; + char *random_radical = A_surfxml_random_radical; + char *rd_name = NULL; + char *rd_value; + mean = surf_parse_get_double(A_surfxml_random_mean); + std = surf_parse_get_double(A_surfxml_random_std_deviation); + min = surf_parse_get_double(A_surfxml_random_min); + max = surf_parse_get_double(A_surfxml_random_max); + seed = surf_parse_get_double(A_surfxml_random_seed); + + double res = 0; + int i = 0; + random_data_t random = xbt_new0(s_random_data_t, 1); + char *tmpbuf; -/* - * New methods to init the routing model component from the lua script - */ - -/* - * calling parse_S_AS_lua with lua values - */ -void routing_AS_init(const char *AS_id, const char *AS_routing) -{ - parse_S_AS_lua((char *) AS_id, (char *) AS_routing); -} - -/* - * calling parse_E_AS_lua to fisnish the creation of routing component - */ -void routing_AS_end(const char *AS_id) -{ - parse_E_AS_lua((char *) AS_id); -} + xbt_dynar_t radical_elements; + unsigned int iter; + char *groups; + int start, end; + xbt_dynar_t radical_ends; -/* - * add a host to the network element list - */ + 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); -void routing_add_host(const char *host_id) -{ - parse_S_host_lua((char *) host_id, (char*)""); // FIXME propagate coordinate system to lua -} + if(xbt_dict_size(random_value)==0) + random_value = xbt_dict_new(); -/* - * Set a new link on the actual list of link for a route or ASroute - */ -void routing_add_link(const char *link_id) -{ - parse_E_link_c_ctn_new_elem_lua((char *) link_id); -} + 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; -/* - *Set the endpoints for a route - */ -void routing_set_route(const char *src_id, const char *dst_id) -{ - parse_S_route_new_and_endpoints_lua(src_id, dst_id); -} + case 2: + start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); + end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); + for (i = start; i <= end; i++) { + xbt_assert(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",bprintf("%s%d",random_id,i)); + res = random_generate(random); + tmpbuf = bprintf("%s%d",random_id,i); + xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free); + xbt_free(tmpbuf); + } + break; + default: + XBT_INFO("Malformed radical"); + break; + } + res = random_generate(random); + rd_name = bprintf("%s_router",random_id); + rd_value = bprintf("%f",res); + xbt_dict_set(random_value, rd_name, rd_value, free); -/* - * Store the route by calling parse_E_route_store_route - */ -void routing_store_route(void) -{ - parse_E_route_store_route(); + xbt_dynar_free(&radical_ends); + } + free(rd_name); + xbt_dynar_free(&radical_elements); + } }