X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff3432a9ed539536119aaf9e7ea104bed36135fb..f193fed57024f1b113f3ec07500a76e1ed5b76b1:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index dce8577b3b..f1be3c151e 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -6,31 +6,31 @@ #include /* regular expression library */ -#include "simgrid/platf_interface.h" // platform creation API internal interface +#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 -int SURF_CPU_LEVEL; //Surf cpu level -int SURF_WKS_LEVEL; //Surf workstation level -int SIMIX_HOST_LEVEL; //Simix level -int MSG_HOST_LEVEL; //Msg level -int SD_HOST_LEVEL; //Simdag level -int COORD_HOST_LEVEL; //Coordinates level -int NS3_HOST_LEVEL; //host node for ns3 +int ROUTING_HOST_LEVEL; //Routing level +int SURF_CPU_LEVEL; //Surf cpu level +int SURF_WKS_LEVEL; //Surf workstation level +int SIMIX_HOST_LEVEL; //Simix level +int MSG_HOST_LEVEL; //Msg level +int SD_HOST_LEVEL; //Simdag level +int COORD_HOST_LEVEL; //Coordinates level +int NS3_HOST_LEVEL; //host node for ns3 xbt_lib_t link_lib; -int SD_LINK_LEVEL; //Simdag level -int SURF_LINK_LEVEL; //Surf level -int NS3_LINK_LEVEL; //link for ns3 +int SD_LINK_LEVEL; //Simdag level +int SURF_LINK_LEVEL; //Surf level +int NS3_LINK_LEVEL; //link for ns3 xbt_lib_t as_router_lib; -int ROUTING_ASR_LEVEL; //Routing level -int COORD_ASR_LEVEL; //Coordinates level -int NS3_ASR_LEVEL; //host node for ns3 +int ROUTING_ASR_LEVEL; //Routing level +int COORD_ASR_LEVEL; //Coordinates level +int NS3_ASR_LEVEL; //host node for ns3 static xbt_dict_t patterns = NULL; static xbt_dict_t random_value = NULL; @@ -38,22 +38,21 @@ static xbt_dict_t random_value = NULL; /* Global vars */ routing_global_t global_routing = NULL; routing_component_t current_routing = NULL; -model_type_t current_routing_model = NULL; +routing_model_description_t current_routing_model = NULL; /* global parse functions */ -xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ -static const char *src = NULL; /* temporary store the source name of a route */ -static const char *dst = NULL; /* temporary store the destination name of a route */ +xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ +static const char *src = NULL; /* temporary store the source name of a route */ +static const char *dst = NULL; /* temporary store the destination name of a route */ static char *gw_src = NULL; /* temporary store the gateway source name of a route */ static char *gw_dst = NULL; /* temporary store the gateway destination name of a route */ -static double_f_cpvoid_t get_link_latency = NULL; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); -static void routing_parse_peer(sg_platf_peer_cbarg_t peer); /* peer bypass */ +static void routing_parse_peer(sg_platf_peer_cbarg_t peer); /* peer bypass */ static void routing_parse_Srandom(void); /* random bypass */ -static char* replace_random_parameter(char * chaine); +static char *replace_random_parameter(char *chaine); static void routing_parse_postparse(void); /* this lines are only for replace use like index in the model table */ @@ -69,57 +68,52 @@ typedef enum { } 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 - }, - { "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} + {"Full", + "Full routing data (fast, large memory requirements, fully expressive)", + model_full_create, model_full_end}, + {"Floyd", + "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)", + model_floyd_create, model_floyd_end}, + {"Dijkstra", + "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)", + model_dijkstra_create, 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_end}, + {"none", "No routing (usable with Constant network only)", + model_none_create, NULL}, + {"RuleBased", "Rule-Based routing data (...)", + model_rulebased_create, NULL}, + {"Vivaldi", "Vivaldi routing", + model_vivaldi_create, NULL}, + {"Cluster", "Cluster routing", + model_cluster_create, NULL}, + {NULL, NULL, NULL, NULL} }; /** * \brief Add a "host" to the network element list */ -static void parse_S_host(sg_platf_host_cbarg_t host) { +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(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); + xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL), + "Reading a host, processing unit \"%s\" already exists", host->id); + + (*(current_routing->parse_PU)) (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 (host->coord && strcmp(host->coord,"")) { - if(!COORD_HOST_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); + 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); } } @@ -131,23 +125,23 @@ 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,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); + 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); + + (*(current_routing->parse_PU)) (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(router->coord,"")) { - if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); + 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); } } @@ -159,12 +153,12 @@ static void routing_parse_S_route(void) { if (src != NULL && dst != NULL && link_list != NULL) THROWF(arg_error, 0, "Route between %s to %s can not be defined", - A_surfxml_route_src, A_surfxml_route_dst); + A_surfxml_route_src, A_surfxml_route_dst); src = A_surfxml_route_src; dst = A_surfxml_route_dst; 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); } @@ -175,15 +169,15 @@ static void routing_parse_S_ASroute(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); } @@ -194,16 +188,16 @@ static void routing_parse_S_bypassRoute(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); } @@ -224,8 +218,9 @@ static void routing_parse_link_ctn(void) break; case A_surfxml_link_ctn_direction_DOWN: link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_id); + break; } - xbt_dynar_push(link_list,&link_id); + xbt_dynar_push(link_list, &link_id); } /** @@ -235,10 +230,10 @@ static void routing_parse_E_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); - (*(current_routing->set_route)) (current_routing, src, dst, route); + xbt_assert(current_routing->parse_route, + "no defined method \"set_route\" in \"%s\"", + current_routing->name); + (*(current_routing->parse_route)) (current_routing, src, dst, route); link_list = NULL; src = NULL; dst = NULL; @@ -253,10 +248,10 @@ static void routing_parse_E_ASroute(void) e_route->generic_route.link_list = link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); - xbt_assert(current_routing->set_ASroute, - "no defined method \"set_ASroute\" in \"%s\"", - current_routing->name); - (*(current_routing->set_ASroute)) (current_routing, src, dst, e_route); + xbt_assert(current_routing->parse_ASroute, + "no defined method \"set_ASroute\" in \"%s\"", + current_routing->name); + (*(current_routing->parse_ASroute)) (current_routing, src, dst, e_route); link_list = NULL; src = NULL; dst = NULL; @@ -273,11 +268,10 @@ static void routing_parse_E_bypassRoute(void) e_route->generic_route.link_list = link_list; e_route->src_gateway = xbt_strdup(gw_src); e_route->dst_gateway = xbt_strdup(gw_dst); - xbt_assert(current_routing->set_bypassroute, - "Bypassing mechanism not implemented by routing '%s'", - current_routing->name); - (*(current_routing->set_bypassroute)) (current_routing, src, dst, - e_route); + xbt_assert(current_routing->parse_bypassroute, + "Bypassing mechanism not implemented by routing '%s'", + current_routing->name); + (*(current_routing->parse_bypassroute)) (current_routing, src, dst, e_route); link_list = NULL; src = NULL; dst = NULL; @@ -298,14 +292,12 @@ static void routing_parse_E_bypassRoute(void) * @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 */ -void routing_AS_open(const char *AS_id, const char *wanted_routing_type) +void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) { routing_component_t new_routing; - model_type_t model = NULL; + routing_model_description_t model = NULL; int cpt; - 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_type, routing_models[cpt].name)) @@ -313,10 +305,10 @@ void routing_AS_open(const char *AS_id, const char *wanted_routing_type) /* if its not exist, error */ if (model == NULL) { fprintf(stderr, "Routing model %s not found. Existing models:\n", - wanted_routing_type); + wanted_routing_type); for (cpt = 0; routing_models[cpt].name; cpt++) fprintf(stderr, " %s: %s\n", routing_models[cpt].name, - routing_models[cpt].desc); + routing_models[cpt].desc); xbt_die(NULL); } @@ -336,8 +328,8 @@ void routing_AS_open(const char *AS_id, const char *wanted_routing_type) } 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 */ @@ -345,17 +337,12 @@ void routing_AS_open(const char *AS_id, const char *wanted_routing_type) 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 */ - (*(current_routing->routing->unload)) (); - + (*(current_routing->parse_AS)) (current_routing, AS_id); } else { THROWF(arg_error, 0, "All defined components must be belong to a AS"); } - /* set the new parse rules */ - (*(new_routing->routing->load)) (); /* set the new current component of the tree */ current_routing = new_routing; } @@ -371,24 +358,25 @@ void routing_AS_open(const char *AS_id, const char *wanted_routing_type) * even if you add stuff to a closed AS * */ -void routing_AS_close() { +void routing_AS_end() +{ if (current_routing == NULL) { 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); + xbt_assert(!xbt_lib_get_or_null + (as_router_lib, current_routing->name, ROUTING_ASR_LEVEL), + "The AS \"%s\" already exists", current_routing->name); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing->routing_father; info->rc_type = SURF_NETWORK_ELEMENT_AS; - xbt_lib_set(as_router_lib,current_routing->name,ROUTING_ASR_LEVEL,(void *) info); + xbt_lib_set(as_router_lib, current_routing->name, ROUTING_ASR_LEVEL, + (void *) info); - (*(current_routing->routing->unload)) (); - (*(current_routing->routing->end)) (); + if (current_routing->routing->end) + (*(current_routing->routing->end)) (); current_routing = current_routing->routing_father; - if (current_routing != NULL) - (*(current_routing->routing->load)) (); } } @@ -400,15 +388,16 @@ void routing_AS_close() { * \param name the host name * */ -static char* elements_As_name(const char *name) - { +static char *elements_As_name(const char *name) +{ routing_component_t as_comp; /* (1) find the as where the host is located */ as_comp = ((network_element_info_t) - xbt_lib_get_or_null(host_lib,name, ROUTING_HOST_LEVEL))->rc_component; + xbt_lib_get_or_null(host_lib, name, + ROUTING_HOST_LEVEL))->rc_component; return as_comp->name; - } +} /** @@ -421,12 +410,12 @@ static char* elements_As_name(const char *name) * father in the chain */ 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) + 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"); -#define ELEMENTS_FATHER_MAXDEPTH 16 /* increase if it is not enough */ +#define ELEMENTS_FATHER_MAXDEPTH 16 /* increase if it is not enough */ routing_component_t src_as, dst_as; routing_component_t path_src[ELEMENTS_FATHER_MAXDEPTH]; routing_component_t path_dst[ELEMENTS_FATHER_MAXDEPTH]; @@ -439,9 +428,9 @@ static void elements_father(const char *src, const char *dst, /* (1) find the as where the src and dst are located */ network_element_info_t src_data = xbt_lib_get_or_null(host_lib, src, - ROUTING_HOST_LEVEL); + ROUTING_HOST_LEVEL); network_element_info_t dst_data = xbt_lib_get_or_null(host_lib, dst, - ROUTING_HOST_LEVEL); + ROUTING_HOST_LEVEL); if (!src_data) src_data = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL); if (!dst_data) @@ -450,15 +439,15 @@ static void elements_father(const char *src, const char *dst, dst_as = dst_data->rc_component; xbt_assert(src_as && dst_as, - "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst); + "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst); /* (2) find the path to the root routing component */ - for (current = src_as ; current != NULL ; 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; } - for (current = dst_as ; current != NULL ; 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; @@ -498,7 +487,7 @@ static void elements_father(const char *src, const char *dst, * recursively through the routing components tree. */ static void _get_route_latency(const char *src, const char *dst, - xbt_dynar_t *route, double *latency) + xbt_dynar_t * route, double *latency) { XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src, dst); xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); @@ -508,7 +497,7 @@ static void _get_route_latency(const char *src, const char *dst, 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 */ route_extended_t e_route = NULL; if (route) { @@ -519,7 +508,7 @@ static void _get_route_latency(const char *src, const char *dst, 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); + "latency error on route between \"%s\" and \"%s\"", src, dst); } if (e_route) { xbt_free(e_route->src_gateway); @@ -534,30 +523,30 @@ static void _get_route_latency(const char *src, const char *dst, e_route_bypass = common_father->get_bypass_route(common_father, src, dst); xbt_assert(!latency || !e_route_bypass, - "Bypass cannot work yet with get_latency"); + "Bypass cannot work yet with get_latency"); route_extended_t e_route_cnt = e_route_bypass - ? e_route_bypass - : common_father->get_route(common_father, - src_father->name, dst_father->name); + ? 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); + 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); + 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); + "latency error on route between \"%s\" and \"%s\"", + src_father->name, dst_father->name); } void *link; @@ -568,11 +557,11 @@ static void _get_route_latency(const char *src, const char *dst, xbt_dynar_t route_src; _get_route_latency(src, e_route_cnt->src_gateway, - (route ? &route_src : NULL), - (latency ? &latency_src : NULL)); + (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); + src, e_route_cnt->src_gateway); xbt_dynar_foreach(route_src, cpt, link) { xbt_dynar_push(*route, &link); } @@ -580,8 +569,8 @@ static void _get_route_latency(const char *src, const char *dst, } if (latency) { xbt_assert(latency_src >= 0.0, - "latency error on route between \"%s\" and \"%s\"", - src, e_route_cnt->src_gateway); + "latency error on route between \"%s\" and \"%s\"", + src, e_route_cnt->src_gateway); *latency += latency_src; } } @@ -597,11 +586,11 @@ static void _get_route_latency(const char *src, const char *dst, xbt_dynar_t route_dst; _get_route_latency(e_route_cnt->dst_gateway, dst, - (route ? &route_dst : NULL), - (latency ? &latency_dst : NULL)); + (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); + e_route_cnt->dst_gateway, dst); xbt_dynar_foreach(route_dst, cpt, link) { xbt_dynar_push(*route, &link); } @@ -609,8 +598,8 @@ static void _get_route_latency(const char *src, const char *dst, } if (latency) { xbt_assert(latency_dst >= 0.0, - "latency error on route between \"%s\" and \"%s\"", - e_route_cnt->dst_gateway, dst); + "latency error on route between \"%s\" and \"%s\"", + e_route_cnt->dst_gateway, dst); *latency += latency_dst; } } @@ -623,12 +612,12 @@ static void _get_route_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) + xbt_dynar_t * route, double *latency, int cleanup) { _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); + "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; @@ -666,7 +655,7 @@ static xbt_dynar_t get_route_or_null(const char *src, const char *dst) xbt_ex_t exception; TRY { get_route_latency(src, dst, &route, NULL, 1); - }CATCH(exception) { + } CATCH(exception) { xbt_ex_free(exception); return NULL; } @@ -698,19 +687,6 @@ static double get_latency(const char *src, const char *dst) 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 * @@ -733,7 +709,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); } } @@ -742,7 +718,7 @@ static void _finalize(routing_component_t rc) * \brief Generic method: delete all the routing structures * * walk through the routing components tree and delete the structures - * by calling the differents "finalize" functions in each routing component + * by calling the different "finalize" functions in each routing component */ static void finalize(void) { @@ -752,8 +728,6 @@ static void finalize(void) 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) @@ -789,16 +763,17 @@ static xbt_dynar_t get_onelink_routes(void) return recursive_get_onelink_routes(global_routing->root); } -e_surf_network_element_type_t get_network_element_type(const char - *name) +e_surf_network_element_type_t get_network_element_type(const char *name) { network_element_info_t rc = NULL; rc = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL); - if(rc) return rc->rc_type; + if (rc) + return rc->rc_type; rc = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); - if(rc) return rc->rc_type; + if (rc) + return rc->rc_type; return SURF_NETWORK_ELEMENT_NULL; } @@ -808,7 +783,7 @@ e_surf_network_element_type_t get_network_element_type(const char * * Make a global routing structure and set all the parsing functions. */ -void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_t get_link_latency_fun) +void routing_model_create(size_t size_of_links, void *loopback) { /* config the uniq global routing */ global_routing = xbt_new0(s_routing_global_t, 1); @@ -824,7 +799,6 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ global_routing->loopback = loopback; global_routing->size_of_link = size_of_links; global_routing->last_route = NULL; - get_link_latency = get_link_latency_fun; /* no current routing at moment */ current_routing = NULL; } @@ -876,435 +850,21 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ /* ************************************************************************** */ /* ************************* GENERIC PARSE FUNCTIONS ************************ */ -void generic_set_processing_unit(routing_component_t rc, - const char *name) -{ - XBT_DEBUG("Load process unit \"%s\"", name); - int *id = xbt_new0(int, 1); - xbt_dict_t _to_index; - _to_index = current_routing->to_index; - *id = xbt_dict_length(_to_index); - xbt_dict_set(_to_index, name, id, xbt_free); -} - -void generic_set_autonomous_system(routing_component_t rc, - const char *name) -{ - XBT_DEBUG("Load Autonomous system \"%s\"", name); - int *id = xbt_new0(int, 1); - xbt_dict_t _to_index; - _to_index = current_routing->to_index; - *id = xbt_dict_length(_to_index); - xbt_dict_set(_to_index, name, id, xbt_free); -} - -int surf_pointer_resource_cmp(const void *a, const void *b) -{ - return a != b; -} - -int surf_link_resource_cmp(const void *a, const void *b) -{ - return !!memcmp(a,b,global_routing->size_of_link); -} - -void generic_set_bypassroute(routing_component_t rc, - 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; - char *route_name; - - 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); - xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name), - "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists", - src, e_route->src_gateway, dst, e_route->dst_gateway); - - route_extended_t new_e_route = - generic_new_extended_route(SURF_ROUTING_RECURSIVE, e_route, 0); - xbt_dynar_free(&(e_route->generic_route.link_list)); - xbt_free(e_route); - - xbt_dict_set(dict_bypassRoutes, route_name, new_e_route, - (void (*)(void *)) generic_free_extended_route); - xbt_free(route_name); -} - -/* ************************************************************************** */ -/* *********************** GENERIC BUSINESS METHODS ************************* */ - -double generic_get_link_latency(routing_component_t rc, - 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; - - 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); - return latency; -} - -xbt_dynar_t generic_get_onelink_routes(routing_component_t rc) -{ - xbt_die("\"generic_get_onelink_routes\" not implemented yet"); -} - -route_extended_t generic_get_bypassroute(routing_component_t rc, - const char *src, - const char *dst) -{ - xbt_dict_t dict_bypassRoutes = rc->bypassRoutes; - routing_component_t src_as, dst_as; - int index_src, index_dst; - xbt_dynar_t path_src = NULL; - xbt_dynar_t path_dst = NULL; - routing_component_t current = NULL; - routing_component_t *current_src = NULL; - routing_component_t *current_dst = NULL; - - /* (1) find the as where the src and dst are located */ - void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL); - void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL); - if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL); - if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL); - - if(src_data == NULL || dst_data == NULL) - xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", - src, dst, rc->name); - - src_as = ((network_element_info_t)src_data)->rc_component; - dst_as = ((network_element_info_t)dst_data)->rc_component; - - /* (2) find the path to the root routing component */ - path_src = xbt_dynar_new(sizeof(routing_component_t), NULL); - current = src_as; - while (current != NULL) { - xbt_dynar_push(path_src, ¤t); - current = current->routing_father; - } - path_dst = xbt_dynar_new(sizeof(routing_component_t), NULL); - current = dst_as; - while (current != NULL) { - xbt_dynar_push(path_dst, ¤t); - current = current->routing_father; - } - - /* (3) find the common father */ - index_src = path_src->used - 1; - index_dst = path_dst->used - 1; - current_src = xbt_dynar_get_ptr(path_src, index_src); - current_dst = xbt_dynar_get_ptr(path_dst, index_dst); - while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) { - 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); - current_dst = xbt_dynar_get_ptr(path_dst, index_dst); - } - - int max_index_src = path_src->used - 1; - int max_index_dst = path_dst->used - 1; - - int max_index = max(max_index_src, max_index_dst); - int i, max; - - route_extended_t e_route_bypass = NULL; - - for (max = 0; max <= max_index; max++) { - for (i = 0; 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); - e_route_bypass = - xbt_dict_get_or_null(dict_bypassRoutes, route_name); - xbt_free(route_name); - } - if (e_route_bypass) - break; - if (max <= max_index_src && i <= max_index_dst) { - char *route_name = bprintf("%s#%s", - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_src, max)))->name, - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_dst, i)))->name); - e_route_bypass = - xbt_dict_get_or_null(dict_bypassRoutes, route_name); - xbt_free(route_name); - } - if (e_route_bypass) - break; - } - - if (e_route_bypass) - break; - - if (max <= max_index_src && max <= max_index_dst) { - char *route_name = bprintf("%s#%s", - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_src, max)))->name, - (*(routing_component_t *) - (xbt_dynar_get_ptr - (path_dst, max)))->name); - e_route_bypass = xbt_dict_get_or_null(dict_bypassRoutes, route_name); - xbt_free(route_name); - } - if (e_route_bypass) - break; - } - - xbt_dynar_free(&path_src); - xbt_dynar_free(&path_dst); - - route_extended_t new_e_route = NULL; - - if (e_route_bypass) { - void *link; - unsigned int cpt = 0; - new_e_route = xbt_new0(s_route_extended_t, 1); - new_e_route->src_gateway = xbt_strdup(e_route_bypass->src_gateway); - new_e_route->dst_gateway = xbt_strdup(e_route_bypass->dst_gateway); - new_e_route->generic_route.link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - xbt_dynar_foreach(e_route_bypass->generic_route.link_list, cpt, link) { - xbt_dynar_push(new_e_route->generic_route.link_list, &link); - } - } - - return new_e_route; -} - -/* ************************************************************************** */ -/* ************************* GENERIC AUX FUNCTIONS ************************** */ - -route_t -generic_new_route(e_surf_routing_hierarchy_t hierarchy, - void *data, int order) -{ - - char *link_name; - route_t new_route; - unsigned int cpt; - xbt_dynar_t links = NULL, links_id = NULL; - - new_route = xbt_new0(s_route_t, 1); - new_route->link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - - xbt_assert(hierarchy == SURF_ROUTING_BASE, - "the hierarchy type is not SURF_ROUTING_BASE"); - - links = ((route_t) data)->link_list; - - - links_id = new_route->link_list; - - xbt_dynar_foreach(links, cpt, link_name) { - - void *link = - xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); - if (link) { - if (order) - xbt_dynar_push(links_id, &link); - else - xbt_dynar_unshift(links_id, &link); - } else - THROWF(mismatch_error, 0, "Link %s not found", link_name); - } - - return new_route; -} - -route_extended_t -generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, - void *data, int order) -{ - - char *link_name; - route_extended_t e_route, new_e_route; - route_t route; - unsigned int cpt; - xbt_dynar_t links = NULL, links_id = NULL; - - new_e_route = xbt_new0(s_route_extended_t, 1); - new_e_route->generic_route.link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - new_e_route->src_gateway = NULL; - new_e_route->dst_gateway = NULL; - - xbt_assert(hierarchy == SURF_ROUTING_BASE - || hierarchy == SURF_ROUTING_RECURSIVE, - "the hierarchy type is not defined"); - - if (hierarchy == SURF_ROUTING_BASE) { - - route = (route_t) data; - links = route->link_list; - - } else if (hierarchy == SURF_ROUTING_RECURSIVE) { - - e_route = (route_extended_t) data; - xbt_assert(e_route->src_gateway - && e_route->dst_gateway, "bad gateway, is null"); - links = e_route->generic_route.link_list; - - /* remeber not erase the gateway names */ - new_e_route->src_gateway = strdup(e_route->src_gateway); - new_e_route->dst_gateway = strdup(e_route->dst_gateway); - } - - links_id = new_e_route->generic_route.link_list; - - xbt_dynar_foreach(links, cpt, link_name) { - - void *link = - xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); - if (link) { - if (order) - xbt_dynar_push(links_id, &link); - else - xbt_dynar_unshift(links_id, &link); - } else - THROWF(mismatch_error, 0, "Link %s not found", link_name); - } - - return new_e_route; -} - -void generic_free_route(route_t route) -{ - if (route) { - xbt_dynar_free(&(route->link_list)); - xbt_free(route); - } -} -void generic_free_extended_route(route_extended_t e_route) +static void routing_parse_cluster(void) { - if (e_route) { - xbt_dynar_free(&(e_route->generic_route.link_list)); - if (e_route->src_gateway) - xbt_free(e_route->src_gateway); - if (e_route->dst_gateway) - xbt_free(e_route->dst_gateway); - xbt_free(e_route); - } -} - -static routing_component_t generic_as_exist(routing_component_t find_from, - routing_component_t to_find) -{ - //return to_find; // FIXME: BYPASSERROR OF FOREACH WITH BREAK - xbt_dict_cursor_t cursor = NULL; - char *key; - int found = 0; - routing_component_t elem; - xbt_dict_foreach(find_from->routing_sons, cursor, key, elem) { - if (to_find == elem || generic_as_exist(elem, to_find)) { - found = 1; - break; - } - } - if (found) - return to_find; - return NULL; -} - -routing_component_t -generic_autonomous_system_exist(routing_component_t rc, char *element) -{ - //return rc; // FIXME: BYPASSERROR OF FOREACH WITH BREAK - routing_component_t element_as, result, elem; - 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; - result = ((routing_component_t) - 1); - if (element_as != rc) - result = generic_as_exist(rc, element_as); - - int found = 0; - if (result) { - xbt_dict_foreach(element_as->routing_sons, cursor, key, elem) { - found = !strcmp(elem->name, element); - if (found) - break; - } - if (found) - return element_as; - } - return NULL; -} - -routing_component_t -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; - 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) -{ - - void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL); - void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL); - if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL); - if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL); - - if(src_data == NULL || dst_data == NULL) - xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", - src, dst, rc->name); - - routing_component_t src_as = ((network_element_info_t)src_data)->rc_component; - routing_component_t dst_as = ((network_element_info_t)dst_data)->rc_component; - - if(src_as != dst_as) - xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS", - src, src_as->name, dst, dst_as->name); - if(rc != dst_as) - xbt_die("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)", - src,dst,src_as->name, dst_as->name,rc->name); -} - -static void routing_parse_cluster(void) { char *host_id, *groups, *link_id = 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) + 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); + 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); } unsigned int iter; @@ -1313,43 +873,53 @@ static void routing_parse_cluster(void) { xbt_dynar_t radical_ends; XBT_DEBUG("", struct_cluster->id); - sg_platf_new_AS_open(struct_cluster->id,"Cluster"); + sg_platf_new_AS_begin(struct_cluster->id, "Cluster"); //Make all hosts radical_elements = xbt_str_split(struct_cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { - memset(&host,0,sizeof(host)); + memset(&host, 0, sizeof(host)); radical_ends = xbt_str_split(groups, "-"); + start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); + switch (xbt_dynar_length(radical_ends)) { case 1: - 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); + end = start; + break; + case 2: + end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); + break; + default: + surf_parse_error("Malformed radical"); + break; + } + 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); + 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); + 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 - { + } else { XBT_DEBUG("\tavailability_file=\"\""); } - if(strcmp(struct_cluster->state_trace,"")){ + 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); + 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 - { + } else { XBT_DEBUG("\tstate_file=\"\""); } @@ -1361,136 +931,52 @@ static void routing_parse_cluster(void) { sg_platf_new_host(&host); XBT_DEBUG(""); + XBT_DEBUG("", link_id, + struct_cluster->bw, struct_cluster->lat); - XBT_DEBUG("", link_id,struct_cluster->bw, struct_cluster->lat); - - memset(&link,0,sizeof(link)); + 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; + 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: - link.policy = SURF_LINK_SHARED; + surf_parse_error(bprintf + ("Invalid cluster sharing policy for cluster %s", + struct_cluster->id)); + break; } - 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); + 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); + 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); + } 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); + surf_routing_cluster_add_link(host_id, info); + xbt_free(link_id); xbt_free(host_id); - - break; - - case 2: - - start=surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); - end= surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); - for (i = start; i <= end; i++) { - 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); @@ -1501,22 +987,24 @@ static void routing_parse_cluster(void) { XBT_DEBUG(" "); XBT_DEBUG("", struct_cluster->router_id); s_sg_platf_router_cbarg_t router; - char *newid=NULL; - memset(&router,0,sizeof(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); + 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); + free(newid); //Make the backbone - if( (struct_cluster->bb_bw!= 0) && (struct_cluster->bb_lat!=0) ){ + 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); + XBT_DEBUG("", link_backbone, + struct_cluster->bb_bw, struct_cluster->bb_lat); - memset(&link,0,sizeof(link)); + memset(&link, 0, sizeof(link)); link.id = link_backbone; link.bandwidth = struct_cluster->bb_bw; link.latency = struct_cluster->bb_lat; @@ -1530,13 +1018,18 @@ static void routing_parse_cluster(void) { link.policy = SURF_LINK_SHARED; break; default: - surf_parse_error(bprintf("Invalid bb sharing policy in cluster %s",struct_cluster->id)); + surf_parse_error(bprintf + ("Invalid bb sharing policy in cluster %s", + struct_cluster->id)); + break; } 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); + 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); @@ -1559,37 +1052,38 @@ static void routing_parse_cluster(void) { xbt_dynar_free(&radical_elements); xbt_free(new_suffix); - if( strcmp(struct_cluster->availability_trace,"") - || strcmp(struct_cluster->state_trace,"") ) + if (strcmp(struct_cluster->availability_trace, "") + || strcmp(struct_cluster->state_trace, "")) xbt_dict_free(&patterns); XBT_DEBUG(""); - sg_platf_new_AS_close(); + sg_platf_new_AS_end(); XBT_DEBUG(" "); } + /* * This function take a string and replace parameters from patterns dict. * It returns the new value. */ -static char* replace_random_parameter(char * string) - { +static char *replace_random_parameter(char *string) +{ char *test_string = NULL; - if(xbt_dict_size(random_value)==0) + if (xbt_dict_size(random_value) == 0) return string; - string = xbt_str_varsubst(string, patterns); // for patterns of cluster + string = xbt_str_varsubst(string, patterns); // for patterns of cluster test_string = bprintf("${%s}", string); - test_string = xbt_str_varsubst(test_string,random_value); //Add ${xxxxx} for random Generator + test_string = xbt_str_varsubst(test_string, random_value); //Add ${xxxxx} for random Generator - if (strcmp(test_string,"")) { //if not empty, keep this value. + if (strcmp(test_string, "")) { //if not empty, keep this value. xbt_free(string); string = test_string; - } //In other case take old value (without ${}) + } //In other case take old value (without ${}) else free(test_string); return string; - } +} static void routing_parse_postparse(void) { @@ -1611,7 +1105,7 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) surfxml_bufferstack_push(1); XBT_DEBUG("", peer->id); - sg_platf_new_AS_open(peer->id, "Full"); + sg_platf_new_AS_begin(peer->id, "Full"); XBT_DEBUG(" "); host_id = HOST_PEER(peer->id); @@ -1624,7 +1118,7 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) XBT_DEBUG("", host_id, peer->power); s_sg_platf_host_cbarg_t host; - memset(&host,0,sizeof(host)); + memset(&host, 0, sizeof(host)); host.initial_state = SURF_RESOURCE_ON; host.id = host_id; host.power_peak = peer->power; @@ -1637,14 +1131,15 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) XBT_DEBUG("", router_id, peer->coord); s_sg_platf_router_cbarg_t router; - memset(&router,0,sizeof(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); + XBT_DEBUG("", link_id_up, + peer->bw_in, peer->lat); s_sg_platf_link_cbarg_t link; - memset(&link,0,sizeof(link)); + memset(&link, 0, sizeof(link)); link.state = SURF_RESOURCE_ON; link.policy = SURF_LINK_SHARED; link.id = link_id_up; @@ -1654,7 +1149,8 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) // 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); + XBT_DEBUG("", link_id_down, + peer->bw_out, peer->lat); link.id = link_id_down; sg_platf_new_link(&link); @@ -1695,7 +1191,7 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) SURFXML_END_TAG(route); XBT_DEBUG(""); - sg_platf_new_AS_close(); + sg_platf_new_AS_end(); XBT_DEBUG(" "); //xbt_dynar_free(&tab_elements_num); @@ -1716,9 +1212,9 @@ static void routing_parse_Srandom(void) 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); + 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; @@ -1741,11 +1237,9 @@ static void routing_parse_Srandom(void) 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); + 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); + 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); @@ -1753,38 +1247,33 @@ static void routing_parse_Srandom(void) 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->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,"")) - { + if (!strcmp(random_radical, "")) { res = random_generate(random); - rd_value = bprintf("%f",res); + rd_value = bprintf("%f", res); xbt_dict_set(random_value, random_id, rd_value, free); - } - else - { + } 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); + 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); + 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; @@ -1792,10 +1281,13 @@ static void routing_parse_Srandom(void) 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)); + 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); + tmpbuf = bprintf("%s%d", random_id, i); + xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), free); xbt_free(tmpbuf); } break; @@ -1804,8 +1296,8 @@ static void routing_parse_Srandom(void) break; } res = random_generate(random); - rd_name = bprintf("%s_router",random_id); - rd_value = bprintf("%f",res); + 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); @@ -1815,24 +1307,26 @@ static void routing_parse_Srandom(void) } } -void routing_register_callbacks() { +void routing_register_callbacks() +{ sg_platf_host_add_cb(parse_S_host); sg_platf_router_add_cb(parse_S_router); surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom); - surfxml_add_callback(STag_surfxml_route_cb_list, &routing_parse_S_route); - surfxml_add_callback(STag_surfxml_ASroute_cb_list, &routing_parse_S_ASroute); - surfxml_add_callback(STag_surfxml_bypassRoute_cb_list,&routing_parse_S_bypassRoute); + surfxml_add_callback(STag_surfxml_route_cb_list, &routing_parse_S_route); + surfxml_add_callback(STag_surfxml_ASroute_cb_list, &routing_parse_S_ASroute); + surfxml_add_callback(STag_surfxml_bypassRoute_cb_list, + &routing_parse_S_bypassRoute); surfxml_add_callback(ETag_surfxml_link_ctn_cb_list, &routing_parse_link_ctn); - surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_parse_E_route); - surfxml_add_callback(ETag_surfxml_ASroute_cb_list, &routing_parse_E_ASroute); - surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list,&routing_parse_E_bypassRoute); + surfxml_add_callback(ETag_surfxml_route_cb_list, &routing_parse_E_route); + surfxml_add_callback(ETag_surfxml_ASroute_cb_list, &routing_parse_E_ASroute); + surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, + &routing_parse_E_bypassRoute); - surfxml_add_callback(STag_surfxml_cluster_cb_list, - &routing_parse_cluster); + surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_parse_cluster); sg_platf_peer_add_cb(routing_parse_peer); sg_platf_postparse_add_cb(routing_parse_postparse);