X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7329497f42d918f8bac62146274854ef8c199681..1d558deeec797460abbfa5ed52f1e7ae784dcf7e:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 25ffc1b4b9..be05319174 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -47,11 +47,10 @@ static const char *dst = NULL; /* temporary store the destination name of 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_dict_t cluster_host_link = NULL; /* for tag cluster */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); -static void routing_parse_Speer(void); /* peer bypass */ +static void routing_parse_Speer(sg_platf_peer_cbarg_t peer); /* peer bypass */ static void routing_parse_Srandom(void); /* random bypass */ static char* replace_random_parameter(char * chaine); @@ -94,45 +93,36 @@ struct s_model_type routing_models[] = { {"Full", {"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_none_unload, model_none_end}, + model_none_load, model_cluster_unload, model_none_end}, {NULL, NULL, NULL, NULL, NULL, NULL} }; /** * \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); } } -/* - * \brief Add a host to the network element list from XML - */ -static void parse_S_host_XML(sg_platf_host_cbarg_t h) -{ - parse_S_host(h->V_host_id, h->V_host_coord); -} - /** * \brief Add a "router" to the network element list */ @@ -141,38 +131,26 @@ 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->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", - 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, - 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,router->V_router_id,ROUTING_ASR_LEVEL,(void *) info); - if (strcmp(A_surfxml_router_coordinates,"")) { + 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(A_surfxml_router_coordinates, " "); + xbt_dynar_t ctn = xbt_str_split_str(router->coord, " "); xbt_dynar_shrink(ctn, 0); - xbt_lib_set(as_router_lib,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_lua(const char* router_id) { - s_sg_platf_router_cbarg_t router; - memset(&router,0,sizeof(router)); - router.V_router_id = router_id; - router.V_router_coord = ""; - return parse_S_router(&router); -} - /** * \brief Set the endponints for a route */ @@ -198,14 +176,6 @@ static void parse_S_route_new_and_endpoints_XML(void) A_surfxml_route_dst); } -/** - * \brief Set the endpoints for a route from lua - */ -static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst) -{ - parse_S_route_new_and_endpoints(id_src, id_dst); -} - /** * \brief Set the endponints and gateways for a ASroute */ @@ -275,14 +245,6 @@ static void parse_E_link_ctn_new_elem_XML(void) } } -/** - * \brief Set a new link on the actual list of link for a route or ASroute from lua - */ -static void parse_E_link_c_ctn_new_elem_lua(const char *link_id) -{ - parse_E_link_ctn_new_elem(link_id); -} - /** * \brief Store the route by calling the set_route function of the current routing component */ @@ -350,10 +312,10 @@ static void parse_E_bypassRoute_store_route(void) * 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 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 sg_platf_new_AS_open(const char *AS_id, const char *wanted_routing_type) +void routing_AS_open(const char *AS_id, const char *wanted_routing_type) { routing_component_t new_routing; model_type_t model = NULL; @@ -426,7 +388,7 @@ void sg_platf_new_AS_open(const char *AS_id, const char *wanted_routing_type) * even if you add stuff to a closed AS * */ -void sg_platf_new_AS_close() { +void routing_AS_close() { if (current_routing == NULL) { THROWF(arg_error, 0, "Close an AS, but none was under construction"); @@ -801,7 +763,7 @@ static void _finalize(routing_component_t rc) */ static void finalize(void) { - /* delete recursibly all the tree */ + /* delete recursively all the tree */ _finalize(global_routing->root); /* delete last_route */ xbt_dynar_free(&(global_routing->last_route)); @@ -884,7 +846,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ current_routing = NULL; /* parse generic elements */ - sg_platf_host_add_cb(parse_S_host_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, @@ -907,9 +869,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_parse_Scluster); - surfxml_add_callback(STag_surfxml_peer_cb_list, - &routing_parse_Speer); - + sg_platf_peer_add_cb(routing_parse_Speer); // FIXME: inline in the sg_platf_new_peer instead sg_platf_postparse_add_cb(clean_routing_after_parse); #ifdef HAVE_TRACING @@ -1386,22 +1346,20 @@ void generic_src_dst_check(routing_component_t rc, const char *src, void routing_parse_Scluster(void) { - if(!cluster_host_link) - cluster_host_link = xbt_dict_new(); - static int AX_ptr = 0; 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->V_cluster_availability_file,"") - || strcmp(struct_cluster->V_cluster_state_file,"") ) + 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",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); + 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; @@ -1415,13 +1373,13 @@ void routing_parse_Scluster(void) surfxml_buffer_stack_stack[0] = 0; surfxml_bufferstack_push(1); - SURFXML_BUFFER_SET(AS_id, struct_cluster->V_cluster_id); + SURFXML_BUFFER_SET(AS_id, struct_cluster->id); SURFXML_BUFFER_SET(AS_routing, "Cluster"); - XBT_DEBUG("", struct_cluster->V_cluster_id); + XBT_DEBUG("", struct_cluster->id); SURFXML_START_TAG(AS); //Make all hosts - radical_elements = xbt_str_split(struct_cluster->V_cluster_radical, ","); + radical_elements = xbt_str_split(struct_cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { memset(&host,0,sizeof(host)); @@ -1429,28 +1387,28 @@ void routing_parse_Scluster(void) 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->V_cluster_prefix, start, struct_cluster->V_cluster_suffix); - link_id = bprintf("%s_link_%d", struct_cluster->V_cluster_id, start); + host_id = bprintf("%s%d%s", struct_cluster->prefix, start, struct_cluster->suffix); + link_id = bprintf("%s_link_%d", struct_cluster->id, start); - XBT_DEBUG("", host_id, struct_cluster->S_cluster_power); - host.V_host_id = host_id; - if(strcmp(struct_cluster->V_cluster_availability_file,"")){ + 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->V_cluster_availability_file); + 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.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 { XBT_DEBUG("\tavailability_file=\"\""); } - if(strcmp(struct_cluster->V_cluster_state_file,"")){ - char *tmp_state_file = xbt_strdup(struct_cluster->V_cluster_state_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.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 @@ -1458,47 +1416,38 @@ 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 = ""; + 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(""); - 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;} - 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); - - 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; + + 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_FATPIPE: + link.policy = SURF_LINK_FATPIPE; + break; + case A_surfxml_cluster_sharing_policy_FULLDUPLEX: + link.policy = SURF_LINK_FULLDUPLEX; + break; + default: + link.policy = SURF_LINK_SHARED; } - surf_parse_link(); - 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){ + 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); free(tmp_link); @@ -1510,7 +1459,7 @@ void routing_parse_Scluster(void) 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); + surf_routing_cluster_add_link(host_id,info); xbt_free(link_id); xbt_free(host_id); @@ -1521,30 +1470,30 @@ void routing_parse_Scluster(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++) { - 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); + host_id = bprintf("%s%d%s", struct_cluster->prefix, i, struct_cluster->suffix); + link_id = bprintf("%s_link_%d", struct_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 = host_id; - if(strcmp(struct_cluster->V_cluster_availability_file,"")){ + 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->V_cluster_availability_file); + 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.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 { XBT_DEBUG("\tavailability_file=\"\""); } - if(strcmp(struct_cluster->V_cluster_state_file,"")){ - char *tmp_state_file = xbt_strdup(struct_cluster->V_cluster_state_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.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 @@ -1552,47 +1501,39 @@ 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 = ""; + 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(""); - 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;} - 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); - - 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; - } - surf_parse_link(); + 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; - ETag_surfxml_link(); + 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 (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){ + 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); @@ -1604,7 +1545,8 @@ void routing_parse_Scluster(void) 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); + surf_routing_cluster_add_link(host_id,info); + xbt_free(link_id); xbt_free(host_id); @@ -1620,45 +1562,49 @@ void routing_parse_Scluster(void) } xbt_dynar_free(&radical_elements); - //Make the router + // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, and it's very useful to connect clusters together XBT_DEBUG(" "); - XBT_DEBUG("", struct_cluster->S_cluster_router_id); - SURFXML_BUFFER_SET(router_id, struct_cluster->S_cluster_router_id); - SURFXML_BUFFER_SET(router_coordinates, ""); - SURFXML_START_TAG(router); - SURFXML_END_TAG(router); + XBT_DEBUG("", struct_cluster->router_id); + s_sg_platf_router_cbarg_t 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); + sg_platf_new_router(&router); + if (newid) + free(newid); //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(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_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; - - if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED) - struct_lnk->V_policy_initial_link = SURF_LINK_SHARED; - else - struct_lnk->V_policy_initial_link = SURF_LINK_FATPIPE; - - surf_parse_link(); - ETag_surfxml_link(); + 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); + + memset(&link,0,sizeof(link)); + link.id = link_backbone; + link.bandwidth = struct_cluster->bb_bw; + link.latency = struct_cluster->bb_lat; + link.state = SURF_RESOURCE_ON; + + switch (AX_surfxml_cluster_bb_sharing_policy) { + case A_surfxml_cluster_bb_sharing_policy_FATPIPE: + link.policy = SURF_LINK_FATPIPE; + break; + case A_surfxml_cluster_bb_sharing_policy_SHARED: + link.policy = SURF_LINK_SHARED; + break; + default: + surf_parse_error(bprintf("Invalid bb sharing policy in 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); 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); + surf_routing_cluster_add_link(struct_cluster->id, info); + free(link_backbone); } @@ -1666,7 +1612,7 @@ void routing_parse_Scluster(void) char *new_suffix = xbt_strdup(""); - radical_elements = xbt_str_split(struct_cluster->V_cluster_suffix, "."); + radical_elements = xbt_str_split(struct_cluster->suffix, "."); xbt_dynar_foreach(radical_elements, iter, groups) { if (strcmp(groups, "")) { char *old_suffix = new_suffix; @@ -1678,8 +1624,8 @@ void routing_parse_Scluster(void) xbt_dynar_free(&radical_elements); xbt_free(new_suffix); - if( strcmp(struct_cluster->V_cluster_availability_file,"") - || strcmp(struct_cluster->V_cluster_state_file,"") ) + if( strcmp(struct_cluster->availability_trace,"") + || strcmp(struct_cluster->state_trace,"") ) xbt_dict_free(&patterns); XBT_DEBUG(""); @@ -1718,7 +1664,7 @@ static void clean_routing_after_parse(void) xbt_dict_free(&patterns); } -static void routing_parse_Speer(void) +static void routing_parse_Speer(sg_platf_peer_cbarg_t peer) { static int AX_ptr = 0; char *host_id = NULL; @@ -1731,63 +1677,53 @@ static void routing_parse_Speer(void) surfxml_bufferstack_push(1); - SURFXML_BUFFER_SET(AS_id, struct_peer->V_peer_id); + XBT_DEBUG("", peer->id); + sg_platf_new_AS_open(peer->id, "Full"); - SURFXML_BUFFER_SET(AS_routing, "Full"); - XBT_DEBUG("", struct_peer->V_peer_id); + XBT_DEBUG(" "); + host_id = HOST_PEER(peer->id); + router_id = ROUTER_PEER(peer->id); + link_id_up = LINK_UP_PEER(peer->id); + link_id_down = LINK_DOWN_PEER(peer->id); - SURFXML_START_TAG(AS); + link_router = bprintf("%s_link_router", peer->id); + link_backbone = bprintf("%s_backbone", peer->id); - XBT_DEBUG(" "); - 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); - - XBT_DEBUG("", host_id, struct_peer->V_peer_power); - A_surfxml_host_state = A_surfxml_host_state_ON; - SURFXML_BUFFER_SET(host_id, host_id); - SURFXML_BUFFER_SET(host_power, struct_peer->V_peer_power); - SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, struct_peer->V_peer_availability_trace); - SURFXML_BUFFER_SET(host_state_file, struct_peer->V_peer_state_trace); - SURFXML_BUFFER_SET(host_coordinates, ""); - SURFXML_BUFFER_SET(host_core, "1.0"); - SURFXML_START_TAG(host); - SURFXML_END_TAG(host); - - XBT_DEBUG("", router_id, struct_peer->V_peer_coord); - SURFXML_BUFFER_SET(router_id, router_id); - SURFXML_BUFFER_SET(router_coordinates, struct_peer->V_peer_coord); - SURFXML_START_TAG(router); - SURFXML_END_TAG(router); - - XBT_DEBUG("", link_id_up, struct_peer->V_peer_bw_in, struct_peer->V_peer_lat); - A_surfxml_link_state = A_surfxml_link_state_ON; - A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; - SURFXML_BUFFER_SET(link_id, link_id_up); - SURFXML_BUFFER_SET(link_bandwidth, struct_peer->V_peer_bw_in); - SURFXML_BUFFER_SET(link_latency, struct_peer->V_peer_lat); - SURFXML_BUFFER_SET(link_bandwidth_file, ""); - SURFXML_BUFFER_SET(link_latency_file, ""); - SURFXML_BUFFER_SET(link_state_file, ""); - SURFXML_START_TAG(link); - SURFXML_END_TAG(link); - - XBT_DEBUG("", link_id_down, struct_peer->V_peer_bw_out, struct_peer->V_peer_lat); - A_surfxml_link_state = A_surfxml_link_state_ON; - A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; - SURFXML_BUFFER_SET(link_id, link_id_down); - SURFXML_BUFFER_SET(link_bandwidth, struct_peer->V_peer_bw_out); - SURFXML_BUFFER_SET(link_latency, struct_peer->V_peer_lat); - SURFXML_BUFFER_SET(link_bandwidth_file, ""); - SURFXML_BUFFER_SET(link_latency_file, ""); - SURFXML_BUFFER_SET(link_state_file, ""); - SURFXML_START_TAG(link); - SURFXML_END_TAG(link); + XBT_DEBUG("", host_id, peer->power); + s_sg_platf_host_cbarg_t host; + memset(&host,0,sizeof(host)); + host.initial_state = SURF_RESOURCE_ON; + host.id = host_id; + host.power_peak = peer->power; + host.power_scale = 1.0; + host.power_trace = peer->availability_trace; + host.state_trace = peer->state_trace; + host.core_amount = 1; + sg_platf_new_host(&host); + + + XBT_DEBUG("", router_id, peer->coord); + s_sg_platf_router_cbarg_t 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); + s_sg_platf_link_cbarg_t link; + memset(&link,0,sizeof(link)); + link.state = SURF_RESOURCE_ON; + link.policy = SURF_LINK_SHARED; + link.id = link_id_up; + link.bandwidth = peer->bw_in; + link.latency = peer->lat; + sg_platf_new_link(&link); + + // 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); + link.id = link_id_down; + sg_platf_new_link(&link); XBT_DEBUG(" "); @@ -1826,7 +1762,7 @@ static void routing_parse_Speer(void) SURFXML_END_TAG(route); XBT_DEBUG(""); - SURFXML_END_TAG(AS); + sg_platf_new_AS_close(); XBT_DEBUG(" "); //xbt_dynar_free(&tab_elements_num); @@ -1945,41 +1881,3 @@ static void routing_parse_Srandom(void) 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(host_id, ""); // FIXME propagate coordinate system to lua -} - -/* - * Set a new link on the actual list of link for a route or ASroute - */ -void routing_add_link(const char *link_id) -{ - parse_E_link_c_ctn_new_elem_lua((char *) link_id); -} - -/* - *Set the endpoints for a route - */ -void routing_set_route(const char *src_id, const char *dst_id) -{ - parse_S_route_new_and_endpoints_lua(src_id, dst_id); -} - -/* - * Store the route by calling parse_E_route_store_route - */ -void routing_store_route(void) -{ - parse_E_route_store_route(); -}