X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a3fac4d6b683940fa2ed70fbb093469c7624bfe2..3072be2de56fbf379bb67604b4aef9701cc76244:/src/surf/surf_routing_rulebased.c diff --git a/src/surf/surf_routing_rulebased.c b/src/surf/surf_routing_rulebased.c index a74ae31707..2e5a948502 100644 --- a/src/surf/surf_routing_rulebased.c +++ b/src/surf/surf_routing_rulebased.c @@ -4,14 +4,12 @@ /* 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. */ #include "surf_routing_private.h" - -#ifdef HAVE_PCRE_LIB #include /* regular expression library */ /* Global vars */ extern routing_global_t global_routing; -extern routing_component_t current_routing; -extern model_type_t current_routing_model; +extern AS_t current_routing; +extern routing_model_description_t current_routing_model; extern xbt_dynar_t link_list; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_rulebased, surf, "Routing part of surf"); @@ -19,7 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_rulebased, surf, "Routing part of sur /* Routing model structure */ typedef struct { - s_routing_component_t generic_routing; + s_as_t generic_routing; xbt_dict_t dict_processing_units; xbt_dict_t dict_autonomous_systems; xbt_dynar_t list_route; @@ -69,7 +67,7 @@ static void rule_route_extended_free(void *e) /* Parse routing model functions */ -static void model_rulebased_set_processing_unit(routing_component_t rc, +static void model_rulebased_parse_PU(AS_t rc, const char *name) { routing_component_rulebased_t routing = @@ -77,7 +75,7 @@ static void model_rulebased_set_processing_unit(routing_component_t rc, xbt_dict_set(routing->dict_processing_units, name, (void *) (-1), NULL); } -static void model_rulebased_set_autonomous_system(routing_component_t rc, +static void model_rulebased_parse_AS(AS_t rc, const char *name) { routing_component_rulebased_t routing = @@ -86,9 +84,9 @@ static void model_rulebased_set_autonomous_system(routing_component_t rc, NULL); } -static void model_rulebased_set_route(routing_component_t rc, +static void model_rulebased_parse_route(AS_t rc, const char *src, const char *dst, - name_route_extended_t route) + route_extended_t route) { routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; @@ -114,9 +112,9 @@ static void model_rulebased_set_route(routing_component_t rc, xbt_free(route); } -static void model_rulebased_set_ASroute(routing_component_t rc, +static void model_rulebased_parse_ASroute(AS_t rc, const char *src, const char *dst, - name_route_extended_t route) + route_extended_t route) { routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; @@ -149,7 +147,7 @@ static void model_rulebased_set_ASroute(routing_component_t rc, xbt_free(route); } -static void model_rulebased_set_bypassroute(routing_component_t rc, +static void model_rulebased_parse_bypassroute(AS_t rc, const char *src, const char *dst, route_extended_t e_route) @@ -181,7 +179,7 @@ static char *remplace(char *value, const char **src_list, int src_size, /* solve the indication */ const char **param_list; - int param_size; + _XBT_GNUC_UNUSED int param_size; if (value[i] == 's' && value[i + 1] == 'r' && value[i + 2] == 'c') { param_list = src_list; param_size = src_size; @@ -215,12 +213,17 @@ static char *remplace(char *value, const char **src_list, int src_size, return memcpy(res, result, i_res); } -static route_extended_t rulebased_get_route(routing_component_t rc, +static route_extended_t rulebased_get_route(AS_t rc, const char *src, const char *dst); -static xbt_dynar_t rulebased_get_onelink_routes(routing_component_t rc) +static xbt_dynar_t rulebased_get_onelink_routes(AS_t rc) { xbt_dynar_t ret = xbt_dynar_new (sizeof(onelink_t), xbt_free); + + //We have already bypass cluster routes with network NS3 + if(!strcmp(surf_network_model->name,"network NS3")) + return ret; + routing_component_rulebased_t routing = (routing_component_rulebased_t)rc; xbt_dict_cursor_t c1 = NULL; @@ -264,7 +267,7 @@ static xbt_dynar_t rulebased_get_onelink_routes(routing_component_t rc) } /* Business methods */ -static route_extended_t rulebased_get_route(routing_component_t rc, +static route_extended_t rulebased_get_route(AS_t rc, const char *src, const char *dst) { @@ -306,7 +309,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, int ovector_dst[OVECCOUNT]; const char **list_src = NULL; const char **list_dst = NULL; - int res; + _XBT_GNUC_UNUSED int res; xbt_dynar_foreach(rule_list, cpt, ruleroute) { rc_src = pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0, @@ -369,14 +372,14 @@ static route_extended_t rulebased_get_route(routing_component_t rc, return new_e_route; } -static route_extended_t rulebased_get_bypass_route(routing_component_t rc, +static route_extended_t rulebased_get_bypass_route(AS_t rc, const char *src, const char *dst) { return NULL; } -static void rulebased_finalize(routing_component_t rc) +static void rulebased_finalize(AS_t rc) { routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; @@ -391,23 +394,20 @@ static void rulebased_finalize(routing_component_t rc) } /* Creation routing model functions */ -void *model_rulebased_create(void) -{ - routing_component_rulebased_t new_component = - xbt_new0(s_routing_component_rulebased_t, 1); - new_component->generic_routing.set_processing_unit = - model_rulebased_set_processing_unit; - new_component->generic_routing.set_autonomous_system = - model_rulebased_set_autonomous_system; - new_component->generic_routing.set_route = model_rulebased_set_route; - new_component->generic_routing.set_ASroute = model_rulebased_set_ASroute; - new_component->generic_routing.set_bypassroute = model_rulebased_set_bypassroute; +AS_t model_rulebased_create(void) { + + routing_component_rulebased_t new_component = (routing_component_rulebased_t) + routmod_generic_create(sizeof(s_routing_component_rulebased_t)); + + new_component->generic_routing.parse_PU = model_rulebased_parse_PU; + new_component->generic_routing.parse_AS = model_rulebased_parse_AS; + new_component->generic_routing.parse_route = model_rulebased_parse_route; + new_component->generic_routing.parse_ASroute = model_rulebased_parse_ASroute; + new_component->generic_routing.parse_bypassroute = model_rulebased_parse_bypassroute; new_component->generic_routing.get_onelink_routes = rulebased_get_onelink_routes; new_component->generic_routing.get_route = rulebased_get_route; - new_component->generic_routing.get_latency = generic_get_link_latency; new_component->generic_routing.get_bypass_route = rulebased_get_bypass_route; new_component->generic_routing.finalize = rulebased_finalize; - new_component->generic_routing.get_network_element_type = get_network_element_type; /* initialization of internal structures */ new_component->dict_processing_units = xbt_dict_new(); new_component->dict_autonomous_systems = xbt_dict_new(); @@ -415,21 +415,6 @@ void *model_rulebased_create(void) new_component->list_ASroute = xbt_dynar_new(sizeof(rule_route_extended_t), &rule_route_extended_free); - return new_component; -} -void model_rulebased_load(void) -{ - /* use "surfxml_add_callback" to add a parse function call */ + return (AS_t) new_component; } - -void model_rulebased_unload(void) -{ - /* use "surfxml_del_callback" to remove a parse function call */ -} - -void model_rulebased_end(void) -{ -} - -#endif /* HAVE_PCRE_LIB */