X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/294ef28ab58ead2be41ffbd89bdc32ce885b5f8a..70388188c97f56fbe2b645c9b00dcb05d0b86509:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 8435506031..e5e66a034b 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -186,11 +186,9 @@ static void parse_E_host(void) /* * \brief Add a host to the network element list from XML */ -static void parse_S_host_XML(void) +static void parse_S_host_XML(surf_parsing_host_arg_t h) { -// XBT_INFO("parse_S_host_XML"); -// XBT_INFO("'%s' '%s'",struct_host->V_host_id, struct_host->V_host_coord); - parse_S_host(struct_host->V_host_id, struct_host->V_host_coord); + parse_S_host(h->V_host_id, h->V_host_coord); } static void parse_E_host_XML(void) { @@ -972,7 +970,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ current_routing = NULL; /* parse generic elements */ - surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML); + 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); @@ -1501,6 +1499,102 @@ static void routing_parse_Econfig(void) 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) @@ -1509,12 +1603,13 @@ void routing_parse_Scluster(void) static int AX_ptr = 0; char *host_id, *groups, *link_id = NULL; + s_surf_parsing_host_arg_t host; + if( strcmp(struct_cluster->V_cluster_availability_file,"") || strcmp(struct_cluster->V_cluster_state_file,"") ) { if(xbt_dict_size(patterns)==0) patterns = xbt_dict_new(); - XBT_INFO("'%s' '%s'",A_surfxml_cluster_state_file,struct_cluster->V_cluster_availability_file); xbt_dict_set(patterns,"id",struct_cluster->V_cluster_id,NULL); xbt_dict_set(patterns,"prefix",struct_cluster->V_cluster_prefix,NULL); xbt_dict_set(patterns,"suffix",struct_cluster->V_cluster_suffix,NULL); @@ -1524,16 +1619,11 @@ void routing_parse_Scluster(void) int start, end, i; xbt_dynar_t radical_elements; xbt_dynar_t radical_ends; - int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy; - int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy; - if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) - xbt_dict_set(cluster_host_link,struct_cluster->V_cluster_id,bprintf("fullduplex"),free); static unsigned int surfxml_buffer_stack_stack_ptr = 1; static unsigned int surfxml_buffer_stack_stack[1024]; surfxml_buffer_stack_stack[0] = 0; - surfxml_bufferstack_push(1); SURFXML_BUFFER_SET(AS_id, struct_cluster->V_cluster_id); @@ -1541,8 +1631,11 @@ void routing_parse_Scluster(void) XBT_DEBUG("", struct_cluster->V_cluster_id); SURFXML_START_TAG(AS); + //Make all hosts radical_elements = xbt_str_split(struct_cluster->V_cluster_radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { + memset(&host,0,sizeof(host)); + radical_ends = xbt_str_split(groups, "-"); switch (xbt_dynar_length(radical_ends)) { case 1: @@ -1551,14 +1644,13 @@ void routing_parse_Scluster(void) link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, start); XBT_DEBUG("", host_id, struct_cluster->S_cluster_power); - struct_host = xbt_new0(s_surf_parsing_host_arg_t, 1); - struct_host->V_host_id = host_id; + host.V_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); - struct_host->V_host_power_trace = tmgr_trace_new(tmp_availability_file); + host.V_host_power_trace = tmgr_trace_new(tmp_availability_file); xbt_free(tmp_availability_file); } else @@ -1569,7 +1661,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); - struct_host->V_host_state_trace = tmgr_trace_new(tmp_state_file); + host.V_host_state_trace = tmgr_trace_new(tmp_state_file); xbt_free(tmp_state_file); } else @@ -1577,18 +1669,18 @@ void routing_parse_Scluster(void) XBT_DEBUG("\tstate_file=\"\""); } - struct_host->V_host_power_peak = struct_cluster->S_cluster_power; - struct_host->V_host_power_scale = 1.0; - struct_host->V_host_core = struct_cluster->S_cluster_core; - struct_host->V_host_state_initial = SURF_RESOURCE_ON; - struct_host->V_host_coord = ""; - surf_parse_host(); + 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(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) + if(struct_cluster->V_cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} - if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) + if(struct_cluster->V_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); @@ -1633,14 +1725,13 @@ void routing_parse_Scluster(void) A_surfxml_host_state = A_surfxml_host_state_ON; XBT_DEBUG("", host_id, struct_cluster->S_cluster_power); - struct_host = xbt_new0(s_surf_parsing_host_arg_t, 1); - struct_host->V_host_id = host_id; + host.V_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); - struct_host->V_host_power_trace = tmgr_trace_new(tmp_availability_file); + host.V_host_power_trace = tmgr_trace_new(tmp_availability_file); xbt_free(tmp_availability_file); } else @@ -1651,7 +1742,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); - struct_host->V_host_state_trace = tmgr_trace_new(tmp_state_file); + host.V_host_state_trace = tmgr_trace_new(tmp_state_file); xbt_free(tmp_state_file); } else @@ -1659,18 +1750,18 @@ void routing_parse_Scluster(void) XBT_DEBUG("\tstate_file=\"\""); } - struct_host->V_host_power_peak = struct_cluster->S_cluster_power; - struct_host->V_host_power_scale = 1.0; - struct_host->V_host_core = struct_cluster->S_cluster_core; - struct_host->V_host_state_initial = SURF_RESOURCE_ON; - struct_host->V_host_coord = ""; - surf_parse_host(); + 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(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) + if(struct_cluster->V_cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} - if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) + if(struct_cluster->V_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); @@ -1714,6 +1805,7 @@ void routing_parse_Scluster(void) } xbt_dynar_free(&radical_elements); + //Make the router XBT_DEBUG(" "); XBT_DEBUG("", struct_cluster->S_cluster_router_id); SURFXML_BUFFER_SET(router_id, struct_cluster->S_cluster_router_id); @@ -1721,16 +1813,17 @@ void routing_parse_Scluster(void) SURFXML_START_TAG(router); SURFXML_END_TAG(router); + //Make the backbone if( (struct_cluster->S_cluster_bb_bw!= 0) && (struct_cluster->S_cluster_bb_lat!=0) ){ char *link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id); XBT_DEBUG("", link_backbone,struct_cluster->S_cluster_bb_bw, struct_cluster->S_cluster_bb_lat); A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; - if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE) + 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 = link_backbone; + 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; @@ -1742,15 +1835,16 @@ void routing_parse_Scluster(void) 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; - } + struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE; surf_parse_link(); ETag_surfxml_link(); + + surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1); + info->link_up = xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL); + info->link_down = info->link_up; + xbt_dict_set(cluster_host_link,struct_cluster->V_cluster_id,info,xbt_free); + free(link_backbone); } XBT_DEBUG(" "); @@ -1778,14 +1872,6 @@ void routing_parse_Scluster(void) XBT_DEBUG(" "); surfxml_bufferstack_pop(1); - -// xbt_dict_cursor_t cursor = NULL; -// char *key,*data; -// -// XBT_INFO("\n"); -// xbt_dict_foreach(cluster_host_link,cursor,key,data){ -// XBT_INFO("%s : %s",key,data); -// } } /* * This function take a string and replace parameters from patterns dict.