X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66f9d7f18e9a5f08bbcc381381283895ab6a0a89..9e6224ecd95ff7b6452fe9b2c088138877797542:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index e0d8795ed0..7380bf694a 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -4,8 +4,6 @@ /* 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 /* regular expression library */ - #include "simgrid/platf_interface.h" // platform creation API internal interface #include "surf_routing_private.h" @@ -42,6 +40,7 @@ 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_PROP_ASR_LEVEL; //Where the properties are stored static xbt_dict_t random_value = NULL; @@ -76,7 +75,6 @@ typedef enum { SURF_MODEL_DIJKSTRA, SURF_MODEL_DIJKSTRACACHE, SURF_MODEL_NONE, - SURF_MODEL_RULEBASED, SURF_MODEL_VIVALDI, SURF_MODEL_CLUSTER } e_routing_types; @@ -96,8 +94,6 @@ struct s_model_type routing_models[] = { model_dijkstracache_create, model_dijkstra_both_end}, {"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).", model_none_create, NULL}, - {"RuleBased", "Rule-Based routing data (...)", - model_rulebased_create, NULL}, {"Vivaldi", "Vivaldi routing", model_vivaldi_create, NULL}, {"Cluster", "Cluster routing", @@ -120,6 +116,8 @@ static void parse_S_host_link(sg_platf_host_link_cbarg_t host) s_surf_parsing_link_up_down_t link_up_down; link_up_down.link_up = xbt_lib_get_or_null(link_lib, host->link_up, SURF_LINK_LEVEL); link_up_down.link_down = xbt_lib_get_or_null(link_lib, host->link_down, SURF_LINK_LEVEL); + link_up_down.limiter_link = NULL; + link_up_down.loopback_link = NULL; xbt_assert(link_up_down.link_up, "Link '%s' not found!",host->link_up); xbt_assert(link_up_down.link_down, "Link '%s' not found!",host->link_down); @@ -147,7 +145,7 @@ static void parse_S_host(sg_platf_host_cbarg_t host) xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL), "Reading a host, processing unit \"%s\" already exists", host->id); - info = xbt_new0(s_network_element_t, 1); + info = xbt_new0(s_routing_edge_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_HOST; info->name = xbt_strdup(host->id); @@ -192,7 +190,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router) "Reading a router, processing unit \"%s\" already exists", router->id); - info = xbt_new0(s_network_element_t, 1); + info = xbt_new0(s_routing_edge_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; info->name = xbt_strdup(router->id); @@ -320,6 +318,8 @@ static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_con } } +extern int _sg_init_status; /* yay, this is an horrible hack */ + /** * \brief Make a new routing component to the platform * @@ -333,25 +333,26 @@ static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_con * @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_begin(const char *AS_id, int wanted_routing_type) +void routing_AS_begin(sg_platf_AS_cbarg_t AS) { XBT_DEBUG("routing_AS_begin"); AS_t new_as; routing_model_description_t model = NULL; xbt_assert(!xbt_lib_get_or_null - (as_router_lib, AS_id, ROUTING_ASR_LEVEL), - "The AS \"%s\" already exists", AS_id); + (as_router_lib, AS->id, ROUTING_ASR_LEVEL), + "The AS \"%s\" already exists", AS->id); + + _sg_init_status = 2; /* horrible hack: direct access to the global controlling the level of configuration to prevent any further config */ /* search the routing model */ - switch(wanted_routing_type){ + switch(AS->routing){ case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break; case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break; case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break; case A_surfxml_AS_routing_Floyd: model = &routing_models[SURF_MODEL_FLOYD];break; case A_surfxml_AS_routing_Full: model = &routing_models[SURF_MODEL_FULL];break; case A_surfxml_AS_routing_None: model = &routing_models[SURF_MODEL_NONE];break; - case A_surfxml_AS_routing_RuleBased: model = &routing_models[SURF_MODEL_RULEBASED];break; case A_surfxml_AS_routing_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break; default: xbt_die("Not a valid model!!!"); break; @@ -361,10 +362,10 @@ void routing_AS_begin(const char *AS_id, int wanted_routing_type) new_as = (AS_t) model->create(); new_as->model_desc = model; new_as->hierarchy = SURF_ROUTING_NULL; - new_as->name = xbt_strdup(AS_id); + new_as->name = xbt_strdup(AS->id); sg_routing_edge_t info = NULL; - info = xbt_new0(s_network_element_t, 1); + info = xbt_new0(s_routing_edge_t, 1); if (current_routing == NULL && routing_platf->root == NULL) { @@ -375,15 +376,15 @@ void routing_AS_begin(const char *AS_id, int wanted_routing_type) } else if (current_routing != NULL && routing_platf->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_as->routing_father = current_routing; /* set the father behavior */ if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_RECURSIVE; /* add to the sons dictionary */ - xbt_dict_set(current_routing->routing_sons, AS_id, + xbt_dict_set(current_routing->routing_sons, AS->id, (void *) new_as, NULL); /* add to the father element list */ info->id = current_routing->parse_AS(current_routing, (void *) info); @@ -395,7 +396,7 @@ void routing_AS_begin(const char *AS_id, int wanted_routing_type) info->rc_type = SURF_NETWORK_ELEMENT_AS; info->name = new_as->name; - xbt_lib_set(as_router_lib, new_as->name, ROUTING_ASR_LEVEL, + xbt_lib_set(as_router_lib, info->name, ROUTING_ASR_LEVEL, (void *) info); XBT_DEBUG("Having set name '%s' id '%d'",new_as->name,info->id); @@ -416,7 +417,7 @@ void routing_AS_begin(const char *AS_id, int wanted_routing_type) * even if you add stuff to a closed AS * */ -void routing_AS_end() +void routing_AS_end(sg_platf_AS_cbarg_t AS) { if (current_routing == NULL) { @@ -520,8 +521,8 @@ static void _get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst, s_sg_platf_route_cbarg_t route; memset(&route,0,sizeof(route)); - XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name, dst->name); xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); + XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name, dst->name); /* Find how src and dst are interconnected */ AS_t common_father, src_father, dst_father; @@ -744,7 +745,10 @@ static void routing_parse_cabinet(sg_platf_cabinet_cbarg_t cabinet) s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); host.initial_state = SURF_RESOURCE_ON; - host.power_peak = cabinet->power; + xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push(power_state_list,&cabinet->power); + host.power_peak = power_state_list; + host.pstate = 0; host.power_scale = 1.0; host.core_amount = 1; @@ -806,7 +810,10 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) } XBT_DEBUG("", cluster->id); - sg_platf_new_AS_begin(cluster->id, A_surfxml_AS_routing_Cluster); + s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; + AS.id = cluster->id; + AS.routing = A_surfxml_AS_routing_Cluster; + sg_platf_new_AS_begin(&AS); current_routing->link_up_down_list = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); @@ -857,7 +864,12 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) XBT_DEBUG("\tstate_file=\"\""); } - host.power_peak = cluster->power; + xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push(power_state_list,&cluster->power); + host.power_peak = power_state_list; + host.pstate = 0; + + //host.power_peak = cluster->power; host.power_scale = 1.0; host.core_amount = cluster->core_amount; host.initial_state = SURF_RESOURCE_ON; @@ -891,6 +903,47 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL); info.link_down = info.link_up; } + + if(cluster->limiter_link!=0){ + char *tmp_link = bprintf("%s_limiter", link_id); + XBT_DEBUG("", tmp_link, + cluster->limiter_link); + + + memset(&link, 0, sizeof(link)); + link.id = tmp_link; + link.bandwidth = cluster->limiter_link; + link.latency = 0; + link.state = SURF_RESOURCE_ON; + link.policy = SURF_LINK_SHARED; + sg_platf_new_link(&link); + info.limiter_link = + xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); + free(tmp_link); + }else{ + info.limiter_link =NULL; + } + + if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ + char *tmp_link = bprintf("%s_loopback", link_id); + XBT_DEBUG("", tmp_link, + cluster->limiter_link); + + + memset(&link, 0, sizeof(link)); + link.id = tmp_link; + link.bandwidth = cluster->loopback_bw; + link.latency = cluster->loopback_lat; + link.state = SURF_RESOURCE_ON; + link.policy = SURF_LINK_FATPIPE; + sg_platf_new_link(&link); + info.loopback_link = + xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); + free(tmp_link); + }else{ + info.loopback_link =NULL; + } + xbt_dynar_push(current_routing->link_up_down_list,&info); xbt_free(link_id); xbt_free(host_id); @@ -914,10 +967,11 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); sg_platf_new_router(&router); + ((as_cluster_t)current_routing)->router = xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL); free(newid); //Make the backbone - if ((cluster->bb_bw != 0) && (cluster->bb_lat != 0)) { + if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) { char *link_backbone = bprintf("%s_backbone", cluster->id); XBT_DEBUG("", link_backbone, cluster->bb_bw, cluster->bb_lat); @@ -960,7 +1014,12 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) memset(&host, 0, sizeof(host)); host.initial_state = SURF_RESOURCE_ON; host.id = host_id; - host.power_peak = peer->power; + + xbt_dynar_t power_state_list = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push(power_state_list,&peer->power); + host.power_peak = power_state_list; + host.pstate = 0; + //host.power_peak = peer->power; host.power_scale = 1.0; host.power_trace = peer->availability_trace; host.state_trace = peer->state_trace; @@ -1013,7 +1072,7 @@ 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); + 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); @@ -1181,3 +1240,36 @@ void routing_exit(void) { finalize_rec(routing_platf->root); xbt_free(routing_platf); } + +AS_t surf_AS_get_routing_root() { + return routing_platf->root; +} + +const char *surf_AS_get_name(AS_t as) { + return as->name; +} + +xbt_dict_t surf_AS_get_routing_sons(AS_t as) { + return as->routing_sons; +} + +const char *surf_AS_get_model(AS_t as) { + return as->model_desc->name; +} + +xbt_dynar_t surf_AS_get_hosts(AS_t as) { + xbt_dynar_t elms = as->index_network_elm; + sg_routing_edge_t relm; + xbt_dictelm_t delm; + int index; + int count = xbt_dynar_length(elms); + xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_dictelm_t), NULL); + for (index = 0; index < count; index++) { + relm = xbt_dynar_get_as(elms, index, sg_routing_edge_t); + delm = xbt_lib_get_elm_or_null(host_lib, relm->name); + if (delm!=NULL) { + xbt_dynar_push(res, &delm); + } + } + return res; +}