From: navarro Date: Thu, 5 Jul 2012 13:21:17 +0000 (+0200) Subject: Use new tag host_link for peer. No need for router now. X-Git-Tag: v3_8~327 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/f64922d48a84a5414cc4761d4a6cdcff45eba195 Use new tag host_link for peer. No need for router now. --- diff --git a/examples/msg/token_ring/two_peers.xml b/examples/msg/token_ring/two_peers.xml index 84491baae3..23e48d85be 100644 --- a/examples/msg/token_ring/two_peers.xml +++ b/examples/msg/token_ring/two_peers.xml @@ -16,11 +16,5 @@ bw_in="2250000000" bw_out="2250000000" lat="5E-4" /> - - - - diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 3849709b7c..f024565306 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -119,7 +119,8 @@ static void parse_S_host_link(sg_platf_host_link_cbarg_t host) sg_routing_edge_t info = NULL; info = xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL); xbt_assert(info, "Host '%s' not found!",host->id); - xbt_assert(current_routing->model_desc == &routing_models[SURF_MODEL_CLUSTER], + xbt_assert(current_routing->model_desc == &routing_models[SURF_MODEL_CLUSTER] || + current_routing->model_desc == &routing_models[SURF_MODEL_VIVALDI], "You have to be in model Cluster to use tag host_link!"); s_surf_parsing_link_up_down_t link_up_down; @@ -137,7 +138,7 @@ static void parse_S_host_link(sg_platf_host_link_cbarg_t host) xbt_dynar_get_as(current_routing->link_up_down_list,info->id,void*)) xbt_die("Host_link for '%s' is already defined!",host->id); - XBT_INFO("Push Host_link for host '%s' to position %d",info->name,info->id); + XBT_DEBUG("Push Host_link for host '%s' to position %d",info->name,info->id); xbt_dynar_set_as(current_routing->link_up_down_list,info->id,s_surf_parsing_link_up_down_t,link_up_down); } @@ -950,7 +951,7 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) { static int AX_ptr = 0; char *host_id = NULL; - char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down; + char *link_id; static unsigned int surfxml_buffer_stack_stack_ptr = 1; static unsigned int surfxml_buffer_stack_stack[1024]; @@ -959,17 +960,9 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) surfxml_bufferstack_push(1); - XBT_DEBUG("", peer->id); - sg_platf_new_AS_begin(peer->id, A_surfxml_AS_routing_Full); - 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); - - link_router = bprintf("%s_link_router", peer->id); - link_backbone = bprintf("%s_backbone", peer->id); + link_id = LINK_PEER(peer->id); XBT_DEBUG("", host_id, peer->power); s_sg_platf_host_cbarg_t host; @@ -984,79 +977,33 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) host.coord = peer->coord; 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, + XBT_DEBUG("", link_id, 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.policy = SURF_LINK_FULLDUPLEX; + link.id = link_id; 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(" "); + char* link_up = bprintf("%s_UP",link_id); + char* link_down = bprintf("%s_DOWN",link_id); + XBT_DEBUG("", host_id,link_up,link_down); + SURFXML_BUFFER_SET(host_link_id, host_id); + SURFXML_BUFFER_SET(host_link_up, link_up); + SURFXML_BUFFER_SET(host_link_down, link_down); + SURFXML_START_TAG(host_link); + SURFXML_END_TAG(host_link); + free(link_up); + free(link_down); - // begin here - XBT_DEBUG(""); - SURFXML_BUFFER_SET(route_src, host_id); - SURFXML_BUFFER_SET(route_dst, router_id); - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; - SURFXML_START_TAG(route); - - XBT_DEBUG("", link_id_up); - SURFXML_BUFFER_SET(link_ctn_id, link_id_up); - A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; - SURFXML_START_TAG(link_ctn); - SURFXML_END_TAG(link_ctn); - - XBT_DEBUG(""); - SURFXML_END_TAG(route); - - //Opposite Route - XBT_DEBUG(""); - SURFXML_BUFFER_SET(route_src, router_id); - SURFXML_BUFFER_SET(route_dst, host_id); - A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; - SURFXML_START_TAG(route); - - XBT_DEBUG("", link_id_down); - SURFXML_BUFFER_SET(link_ctn_id, link_id_down); - A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; - SURFXML_START_TAG(link_ctn); - SURFXML_END_TAG(link_ctn); - - XBT_DEBUG(""); - SURFXML_END_TAG(route); - - XBT_DEBUG(""); - sg_platf_new_AS_end(); XBT_DEBUG(" "); //xbt_dynar_free(&tab_elements_num); free(host_id); - free(router_id); - free(link_router); - free(link_backbone); - free(link_id_up); - free(link_id_down); + free(link_id); surfxml_bufferstack_pop(1); } diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h index 61f6cb192e..112a13dea2 100644 --- a/src/surf/surf_routing_private.h +++ b/src/surf/surf_routing_private.h @@ -84,8 +84,7 @@ AS_t model_cluster_create(void); /* create structures for cluster routing m AS_t model_vivaldi_create(void); /* create structures for vivaldi routing model */ #define HOST_PEER(peername) bprintf("peer_%s", peername) #define ROUTER_PEER(peername) bprintf("router_%s", peername) -#define LINK_UP_PEER(peername) bprintf("link_%s_up", peername) -#define LINK_DOWN_PEER(peername) bprintf("link_%s_down", peername) +#define LINK_PEER(peername) bprintf("link_%s", peername) /* ************************************************************************** */ /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ diff --git a/src/surf/surf_routing_vivaldi.c b/src/surf/surf_routing_vivaldi.c index 6cdf157f19..00b7e77d16 100644 --- a/src/surf/surf_routing_vivaldi.c +++ b/src/surf/surf_routing_vivaldi.c @@ -20,6 +20,8 @@ static void vivaldi_get_route_and_latency( AS_t rc, sg_routing_edge_t src_p, sg_routing_edge_t dst_p, route_t route, double *lat) { + s_surf_parsing_link_up_down_t info; + XBT_DEBUG("vivaldi_get_route_and_latency from '%s'[%d] '%s'[%d]",src_p->name,src_p->id,dst_p->name,dst_p->id); char *src = (char*)src_p->name; char *dst = (char*)dst_p->name; @@ -35,6 +37,15 @@ static void vivaldi_get_route_and_latency( if(src_p->rc_type == SURF_NETWORK_ELEMENT_HOST){ tmp_src_name = HOST_PEER(src); + + if(rc->link_up_down_list){ + info = xbt_dynar_get_as(rc->link_up_down_list,src_p->id,s_surf_parsing_link_up_down_t); + if(info.link_up) { // link up + xbt_dynar_push_as(route->link_list,void*,info.link_up); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(info.link_up); + } + } src_ctn = xbt_lib_get_or_null(host_lib, tmp_src_name, COORD_HOST_LEVEL); if(!src_ctn ) src_ctn = xbt_lib_get_or_null(host_lib, src, COORD_HOST_LEVEL); } @@ -48,6 +59,15 @@ static void vivaldi_get_route_and_latency( if(dst_p->rc_type == SURF_NETWORK_ELEMENT_HOST){ tmp_dst_name = HOST_PEER(dst); + + if(rc->link_up_down_list){ + info = xbt_dynar_get_as(rc->link_up_down_list,dst_p->id,s_surf_parsing_link_up_down_t); + if(info.link_down) { // link down + xbt_dynar_push_as(route->link_list,void*,info.link_down); + if (lat) + *lat += surf_network_model->extension.network.get_link_latency(info.link_down); + } + } dst_ctn = xbt_lib_get_or_null(host_lib, tmp_dst_name, COORD_HOST_LEVEL); if(!dst_ctn ) dst_ctn = xbt_lib_get_or_null(host_lib, dst, COORD_HOST_LEVEL); } @@ -67,15 +87,23 @@ static void vivaldi_get_route_and_latency( euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn)) + fabs(xbt_dynar_get_as(src_ctn, 2, double))+fabs(xbt_dynar_get_as(dst_ctn, 2, double)); - if (lat) - *lat += euclidean_dist / 1000; //From .ms to .s + if (lat){ + XBT_DEBUG("Updating latency %f += %f",*lat,euclidean_dist); + *lat += euclidean_dist / 1000.0; //From .ms to .s + } } +static int vivaldi_parse_PU(AS_t rc, sg_routing_edge_t elm) { + XBT_DEBUG("Load process unit \"%s\"", elm->name); + xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm); + return xbt_dynar_length(rc->index_network_elm)-1; +} /* Creation routing model functions */ AS_t model_vivaldi_create(void) { AS_t new_component = model_rulebased_create(); new_component->get_route_and_latency = vivaldi_get_route_and_latency; + new_component->parse_PU = vivaldi_parse_PU; return new_component; } diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c index 8a1c8d0e94..599665835e 100644 --- a/src/surf/surfxml_parse.c +++ b/src/surf/surfxml_parse.c @@ -406,7 +406,7 @@ void ETag_surfxml_host(void) { } void STag_surfxml_host_link(void){ - XBT_INFO("Create a Host_link for %s",A_surfxml_host_link_id); + XBT_DEBUG("Create a Host_link for %s",A_surfxml_host_link_id); s_sg_platf_host_link_cbarg_t host_link; memset(&host_link,0,sizeof(host_link)); @@ -417,7 +417,7 @@ void STag_surfxml_host_link(void){ } void ETag_surfxml_host_link(void){ - XBT_INFO("End create a Host_link for %s",A_surfxml_host_link_id); + XBT_DEBUG("End create a Host_link for %s",A_surfxml_host_link_id); } void STag_surfxml_router(void){