X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/02b7b97c6140acd91203e555f3ee999f7abf353c..04c10dad7fa6089786021b0f8b4413f86bafd6fd:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 349b8cf2a0..24f8467e32 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -1,10 +1,13 @@ -/* 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. */ #include /* regular expression library */ + +#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" @@ -50,10 +53,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); static void routing_parse_Speer(void); /* peer bypass */ static void routing_parse_Srandom(void); /* random bypass */ -static void routing_parse_Erandom(void); /* random bypass */ - -static void routing_parse_Sconfig(void); /* config Tag */ -static void routing_parse_Econfig(void); /* config Tag */ static char* replace_random_parameter(char * chaine); static void clean_routing_after_parse(void); @@ -91,164 +90,77 @@ struct s_model_type routing_models[] = { {"Full", {"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_rulebased_load, model_rulebased_unload, model_rulebased_end}, -{"Vivaldi", "Vivaldi routing", model_rulebased_create, - model_rulebased_load, model_rulebased_unload, model_rulebased_end}, + 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_rulebased_load, model_rulebased_unload, model_rulebased_end}, + model_none_load, model_none_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); - - //From .ms to .s - return euclidean_dist / 1000; -} - -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), + xbt_assert(!xbt_lib_get_or_null(host_lib, host->id,ROUTING_HOST_LEVEL), "Reading a host, processing unit \"%s\" already exists", - host_id); + 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); + (*(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(surf_parsing_host_arg_t h) -{ - parse_S_host(h->V_host_id, h->V_host_coord); -} -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(void) +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,struct_router->V_router_id, ROUTING_ASR_LEVEL), + xbt_assert(!xbt_lib_get_or_null(as_router_lib,router->id, ROUTING_ASR_LEVEL), "Reading a router, processing unit \"%s\" already exists", - struct_router->V_router_id); + 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, - struct_router->V_router_id); + (*(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,struct_router->V_router_id,ROUTING_ASR_LEVEL,(void *) info); + xbt_lib_set(as_router_lib,router->id,ROUTING_ASR_LEVEL,(void *) info); if (strcmp(A_surfxml_router_coordinates,"")) { if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " "); xbt_dynar_shrink(ctn, 0); - xbt_lib_set(as_router_lib,struct_router->V_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(); -} - -/** - * brief Add a "router" to the network element list from XML description - */ -static void parse_S_router_lua(const char* router_id) -{ - struct_router->V_router_id = xbt_strdup(router_id); - struct_router->V_router_coord = xbt_strdup(""); - return parse_S_router(); +static void parse_S_router_lua(const char* router_id) { + s_sg_platf_router_cbarg_t router; + memset(&router,0,sizeof(router)); + router.id = router_id; + router.coord = ""; + return parse_S_router(&router); } /** @@ -419,16 +331,26 @@ static void parse_E_bypassRoute_store_route(void) } /** - * \brief Make a new routing component + * \brief Make a new routing component to the platform * - * make the new structure and - * set the parsing functions to allows parsing the part of the routing tree + * 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. + * + * @param AS_id name of this autonomous system. Must be uniq 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_init(const char *AS_id, const char *wanted_routing_type) +void sg_platf_new_AS_open(const char *AS_id, const char *wanted_routing_type) { routing_component_t new_routing; model_type_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)) @@ -450,10 +372,6 @@ void routing_AS_init(const char *AS_id, const char *wanted_routing_type) 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 */ @@ -488,16 +406,20 @@ void routing_AS_init(const char *AS_id, const char *wanted_routing_type) } /** - * \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 */ -void routing_AS_end(const char *AS_id) -{ +void sg_platf_new_AS_close() { if (current_routing == NULL) { - THROWF(arg_error, 0, "Close AS(%s), that were never opened", 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), @@ -830,7 +752,6 @@ void surf_parse_models_setup() if (surf_parse_models_setup_already_called) return; surf_parse_models_setup_already_called=1; - routing_parse_Erandom(); surf_config_models_setup(); } @@ -953,9 +874,8 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ current_routing = NULL; /* parse generic elements */ - surf_parse_host_add_cb(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); + sg_platf_host_add_cb(parse_S_host); + sg_platf_router_add_cb(parse_S_router); surfxml_add_callback(STag_surfxml_route_cb_list, &parse_S_route_new_and_endpoints_XML); @@ -980,8 +900,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ surfxml_add_callback(STag_surfxml_peer_cb_list, &routing_parse_Speer); - surfxml_add_callback(ETag_surfxml_platform_cb_list, - &clean_routing_after_parse); + sg_platf_postparse_add_cb(clean_routing_after_parse); #ifdef HAVE_TRACING instr_routing_define_callbacks(); @@ -990,12 +909,10 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ 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_random_cb_list, &routing_parse_Srandom); + surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom); } + /* ************************************************** */ /* ********** PATERN FOR NEW ROUTING **************** */ @@ -1457,124 +1374,6 @@ void generic_src_dst_check(routing_component_t rc, const char *src, 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 defined by user!",key); - free(cfg); - } - XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); -} - -static void parse_create_host_link(int i) -{ - char *host_id, *link_id = NULL; - s_surf_parsing_host_arg_t host; - memset(&host,0,sizeof(host)); - - host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, i, struct_cluster->V_cluster_suffix); - link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, i); - - A_surfxml_host_state = A_surfxml_host_state_ON; - - XBT_DEBUG("", host_id, struct_cluster->S_cluster_power); - host.V_host_id = xbt_strdup(host_id); - if(strcmp(struct_cluster->V_cluster_availability_file,"")){ - xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free); - char* tmp_availability_file = xbt_strdup(struct_cluster->V_cluster_availability_file); - xbt_str_varsubst(tmp_availability_file,patterns); - XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file); - host.V_host_power_trace = tmgr_trace_new(tmp_availability_file); - xbt_free(tmp_availability_file); - } - else - { - XBT_DEBUG("\tavailability_file=\"\""); - } - if(strcmp(struct_cluster->V_cluster_state_file,"")){ - char *tmp_state_file = xbt_strdup(struct_cluster->V_cluster_state_file); - xbt_str_varsubst(tmp_state_file,patterns); - XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file); - host.V_host_state_trace = tmgr_trace_new(tmp_state_file); - xbt_free(tmp_state_file); - } - else - { - XBT_DEBUG("\tstate_file=\"\""); - } - - host.V_host_power_peak = struct_cluster->S_cluster_power; - host.V_host_power_scale = 1.0; - host.V_host_core = struct_cluster->S_cluster_core; - host.V_host_state_initial = SURF_RESOURCE_ON; - host.V_host_coord = ""; - surf_parse_host(&host); - XBT_DEBUG(""); - - A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; - if(AX_surfxml_cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) - {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} - if(AX_surfxml_cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) - {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} - - XBT_DEBUG("", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat); - - struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1); - struct_lnk->V_link_id = xbt_strdup(link_id); - struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw; - struct_lnk->V_link_latency = struct_cluster->S_cluster_lat; - struct_lnk->V_link_bandwidth_file = NULL; - struct_lnk->V_link_latency_file = NULL; - struct_lnk->V_link_state_file = NULL; - struct_lnk->V_link_state = SURF_RESOURCE_ON; - struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy; - - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - struct_lnk->V_policy_initial_link = SURF_LINK_SHARED; - else - { - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) - struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE; - else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) - struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX; - } - surf_parse_link(); - - ETag_surfxml_host(); - ETag_surfxml_link(); - - surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1); - - if (A_surfxml_link_sharing_policy == A_surfxml_link_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; - } - xbt_dict_set(cluster_host_link,host_id,info,xbt_free); - xbt_free(link_id); - xbt_free(host_id); -} - void routing_parse_Scluster(void) { if(!cluster_host_link) @@ -1583,7 +1382,8 @@ void routing_parse_Scluster(void) static int AX_ptr = 0; char *host_id, *groups, *link_id = NULL; - s_surf_parsing_host_arg_t host; + s_sg_platf_host_cbarg_t host; + s_sg_platf_link_cbarg_t link; if( strcmp(struct_cluster->V_cluster_availability_file,"") || strcmp(struct_cluster->V_cluster_state_file,"") ) @@ -1619,18 +1419,18 @@ void routing_parse_Scluster(void) 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 *)); + start=surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); host_id = bprintf("%s%d%s", struct_cluster->V_cluster_prefix, start, struct_cluster->V_cluster_suffix); link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, start); XBT_DEBUG("", host_id, struct_cluster->S_cluster_power); - host.V_host_id = host_id; + host.id = host_id; if(strcmp(struct_cluster->V_cluster_availability_file,"")){ xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free); char* tmp_availability_file = xbt_strdup(struct_cluster->V_cluster_availability_file); xbt_str_varsubst(tmp_availability_file,patterns); XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file); - host.V_host_power_trace = tmgr_trace_new(tmp_availability_file); + host.power_trace = tmgr_trace_new(tmp_availability_file); xbt_free(tmp_availability_file); } else @@ -1641,7 +1441,7 @@ void routing_parse_Scluster(void) char *tmp_state_file = xbt_strdup(struct_cluster->V_cluster_state_file); xbt_str_varsubst(tmp_state_file,patterns); XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file); - host.V_host_state_trace = tmgr_trace_new(tmp_state_file); + host.state_trace = tmgr_trace_new(tmp_state_file); xbt_free(tmp_state_file); } else @@ -1649,14 +1449,15 @@ void routing_parse_Scluster(void) XBT_DEBUG("\tstate_file=\"\""); } - host.V_host_power_peak = struct_cluster->S_cluster_power; - host.V_host_power_scale = 1.0; - host.V_host_core = struct_cluster->S_cluster_core; - host.V_host_state_initial = SURF_RESOURCE_ON; - host.V_host_coord = ""; - surf_parse_host(&host); + host.power_peak = struct_cluster->S_cluster_power; + host.power_scale = 1.0; + host.core_amount = struct_cluster->S_cluster_core; + host.initial_state = SURF_RESOURCE_ON; + host.coord = ""; + sg_platf_new_host(&host); XBT_DEBUG(""); + A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(struct_cluster->V_cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} @@ -1665,39 +1466,55 @@ void routing_parse_Scluster(void) XBT_DEBUG("", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat); - struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1); - struct_lnk->V_link_id = link_id; - struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw; - struct_lnk->V_link_latency = struct_cluster->S_cluster_lat; - struct_lnk->V_link_bandwidth_file = NULL; - struct_lnk->V_link_latency_file = NULL; - struct_lnk->V_link_state_file = NULL; - struct_lnk->V_link_state = SURF_RESOURCE_ON; - struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy; - - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - struct_lnk->V_policy_initial_link = SURF_LINK_SHARED; - else - { - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) - struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE; - else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) - struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX; + memset(&link,0,sizeof(link)); + link.V_link_id = link_id; + link.V_link_bandwidth = struct_cluster->S_cluster_bw; + link.V_link_latency = struct_cluster->S_cluster_lat; + link.V_link_bandwidth_file = NULL; + link.V_link_latency_file = NULL; + link.V_link_state_file = NULL; + link.V_link_state = SURF_RESOURCE_ON; + link.V_link_sharing_policy = A_surfxml_link_sharing_policy; + + switch (A_surfxml_link_sharing_policy) { + case A_surfxml_link_sharing_policy_SHARED: + link.V_policy_initial_link = SURF_LINK_SHARED; + break; + case A_surfxml_link_sharing_policy_FATPIPE: + link.V_policy_initial_link = SURF_LINK_FATPIPE; + break; + case A_surfxml_link_sharing_policy_FULLDUPLEX: + link.V_policy_initial_link = SURF_LINK_FULLDUPLEX; + break; + case AU_surfxml_link_sharing_policy: + surf_parse_error(bprintf("Invalid sharing policy in cluster %s (please report this bug, this shouldn't happen)",struct_cluster->V_cluster_id)); } - surf_parse_link(); - xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free); -// XBT_INFO("key '%s' Value '%s'",host_id,link_id); - ETag_surfxml_host(); - ETag_surfxml_link(); + sg_platf_new_link(&link); + + surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1); + if (A_surfxml_link_sharing_policy == A_surfxml_link_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; + } + xbt_dict_set(cluster_host_link,host_id,info,xbt_free); + xbt_free(link_id); + xbt_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 *)); + 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->V_cluster_prefix, i, struct_cluster->V_cluster_suffix); link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, i); @@ -1705,13 +1522,13 @@ void routing_parse_Scluster(void) A_surfxml_host_state = A_surfxml_host_state_ON; XBT_DEBUG("", host_id, struct_cluster->S_cluster_power); - host.V_host_id = host_id; + host.id = host_id; if(strcmp(struct_cluster->V_cluster_availability_file,"")){ xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free); char* tmp_availability_file = xbt_strdup(struct_cluster->V_cluster_availability_file); xbt_str_varsubst(tmp_availability_file,patterns); XBT_DEBUG("\tavailability_file=\"%s\"",tmp_availability_file); - host.V_host_power_trace = tmgr_trace_new(tmp_availability_file); + host.power_trace = tmgr_trace_new(tmp_availability_file); xbt_free(tmp_availability_file); } else @@ -1722,7 +1539,7 @@ void routing_parse_Scluster(void) char *tmp_state_file = xbt_strdup(struct_cluster->V_cluster_state_file); xbt_str_varsubst(tmp_state_file,patterns); XBT_DEBUG("\tstate_file=\"%s\"",tmp_state_file); - host.V_host_state_trace = tmgr_trace_new(tmp_state_file); + host.state_trace = tmgr_trace_new(tmp_state_file); xbt_free(tmp_state_file); } else @@ -1730,12 +1547,12 @@ void routing_parse_Scluster(void) XBT_DEBUG("\tstate_file=\"\""); } - host.V_host_power_peak = struct_cluster->S_cluster_power; - host.V_host_power_scale = 1.0; - host.V_host_core = struct_cluster->S_cluster_core; - host.V_host_state_initial = SURF_RESOURCE_ON; - host.V_host_coord = ""; - surf_parse_host(&host); + host.power_peak = struct_cluster->S_cluster_power; + host.power_scale = 1.0; + host.core_amount = struct_cluster->S_cluster_core; + host.initial_state = SURF_RESOURCE_ON; + host.coord = ""; + sg_platf_new_host(&host); XBT_DEBUG(""); A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; @@ -1746,33 +1563,46 @@ void routing_parse_Scluster(void) XBT_DEBUG("", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat); - struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1); - struct_lnk->V_link_id = link_id; - struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bw; - struct_lnk->V_link_latency = struct_cluster->S_cluster_lat; - struct_lnk->V_link_bandwidth_file = NULL; - struct_lnk->V_link_latency_file = NULL; - struct_lnk->V_link_state_file = NULL; - struct_lnk->V_link_state = SURF_RESOURCE_ON; - struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy; + memset(&link,0,sizeof(link)); + link.V_link_id = link_id; + link.V_link_bandwidth = struct_cluster->S_cluster_bw; + link.V_link_latency = struct_cluster->S_cluster_lat; + link.V_link_bandwidth_file = NULL; + link.V_link_latency_file = NULL; + link.V_link_state_file = NULL; + link.V_link_state = SURF_RESOURCE_ON; + link.V_link_sharing_policy = A_surfxml_link_sharing_policy; if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - struct_lnk->V_policy_initial_link = SURF_LINK_SHARED; + link.V_policy_initial_link = SURF_LINK_SHARED; else { if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE) - struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE; + link.V_policy_initial_link = SURF_LINK_FATPIPE; else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX) - struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX; + link.V_policy_initial_link = SURF_LINK_FULLDUPLEX; } - surf_parse_link(); - - xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free); -// XBT_INFO("key '%s' Value '%s'",host_id,link_id); + sg_platf_new_link(&link); - ETag_surfxml_host(); ETag_surfxml_link(); + surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1); + if (A_surfxml_link_sharing_policy == A_surfxml_link_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; + } + xbt_dict_set(cluster_host_link,host_id,info,xbt_free); + xbt_free(link_id); + xbt_free(host_id); + } break; @@ -1802,22 +1632,22 @@ void routing_parse_Scluster(void) if(AX_surfxml_cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} - struct_lnk = xbt_new0(s_surf_parsing_link_arg_t, 1); - struct_lnk->V_link_id = xbt_strdup(link_backbone); - struct_lnk->V_link_bandwidth = struct_cluster->S_cluster_bb_bw; - struct_lnk->V_link_latency = struct_cluster->S_cluster_bb_lat; - struct_lnk->V_link_bandwidth_file = NULL; - struct_lnk->V_link_latency_file = NULL; - struct_lnk->V_link_state_file = NULL; - struct_lnk->V_link_state = SURF_RESOURCE_ON; - struct_lnk->V_link_sharing_policy = A_surfxml_link_sharing_policy; + memset(&link,0,sizeof(link)); + link.V_link_id = link_backbone; + link.V_link_bandwidth = struct_cluster->S_cluster_bb_bw; + link.V_link_latency = struct_cluster->S_cluster_bb_lat; + link.V_link_bandwidth_file = NULL; + link.V_link_latency_file = NULL; + link.V_link_state_file = NULL; + link.V_link_state = SURF_RESOURCE_ON; + link.V_link_sharing_policy = A_surfxml_link_sharing_policy; if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - struct_lnk->V_policy_initial_link = SURF_LINK_SHARED; + link.V_policy_initial_link = SURF_LINK_SHARED; else - struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE; + link.V_policy_initial_link = SURF_LINK_FATPIPE; - surf_parse_link(); + sg_platf_new_link(&link); ETag_surfxml_link(); surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1); @@ -1904,10 +1734,10 @@ static void routing_parse_Speer(void) SURFXML_START_TAG(AS); XBT_DEBUG(" "); - host_id = bprintf("peer_%s", struct_peer->V_peer_id); - router_id = bprintf("router_%s", struct_peer->V_peer_id); - link_id_up = bprintf("link_%s_up", struct_peer->V_peer_id); - link_id_down = bprintf("link_%s_down", struct_peer->V_peer_id); + host_id = HOST_PEER(struct_peer->V_peer_id); + router_id = ROUTER_PEER(struct_peer->V_peer_id); + link_id_up = LINK_UP_PEER(struct_peer->V_peer_id); + link_id_down = LINK_DOWN_PEER(struct_peer->V_peer_id); link_router = bprintf("%s_link_router", struct_peer->V_peer_id); link_backbone = bprintf("%s_backbone", struct_peer->V_peer_id); @@ -2006,136 +1836,111 @@ static void routing_parse_Speer(void) 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); + 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; - 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); + 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); + 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++) { + 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_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); - - 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; + } + 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); - xbt_dict_foreach(random_value, cursor, key, elem) { - XBT_DEBUG("%s = %s",key,elem); - } -*/ + xbt_dynar_free(&radical_ends); + } + free(rd_name); + xbt_dynar_free(&radical_elements); + } } -/* - * New methods to init the routing model component from the lua script - */ - - -/* - * add a host to the network element list - */ - -void routing_add_host(const char *host_id) -{ - parse_S_host_lua((char *) host_id, (char*)""); // FIXME propagate coordinate system to lua -} /* * Set a new link on the actual list of link for a route or ASroute