XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_vivaldi, surf, "Routing part of surf");
-/* Business methods */
-static route_t vivaldi_get_route(AS_t rc, const char *src, const char *dst)
-{
- xbt_assert(rc && src
- && dst,
- "Invalid params for \"get_route\" function at AS \"%s\"",
- rc->name);
+static XBT_INLINE double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) {
+ double src_coord, dst_coord;
+
+ src_coord = xbt_dynar_get_as(src, index, double);
+ dst_coord = xbt_dynar_get_as(dst, index, double);
- route_t new_e_route = xbt_new0(s_route_t, 1);
- new_e_route->src_gateway = ROUTER_PEER(src);
- new_e_route->dst_gateway = ROUTER_PEER(dst);
- new_e_route->link_list = xbt_dynar_new(0, NULL);
- return new_e_route;
+ return (src_coord-dst_coord)*(src_coord-dst_coord);
}
-static double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
+static void vivaldi_get_route_and_latency(
+ AS_t rc, network_element_t src_p, network_element_t dst_p,
+ route_t route, double *lat)
{
- double src_coord, dst_coord;
-
- // FIXME converting from string to float each time we need a coordinate is ... suboptimal
- src_coord = atof(xbt_dynar_get_as(src, index, char *));
- dst_coord = atof(xbt_dynar_get_as(dst, index, char *));
+ 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;
- return (src_coord-dst_coord)*(src_coord-dst_coord);
-
-}
+ if(src_p->rc_type == SURF_NETWORK_ELEMENT_AS) {
+ route->src_gateway = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(src),ROUTING_ASR_LEVEL);
+ route->dst_gateway = xbt_lib_get_or_null(as_router_lib,ROUTER_PEER(dst),ROUTING_ASR_LEVEL);
+ }
-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);
+ char *tmp_src_name, *tmp_dst_name;
+
+ if(src_p->rc_type == SURF_NETWORK_ELEMENT_HOST){
+ tmp_src_name = HOST_PEER(src);
+ 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);
+ }
+ else if(src_p->rc_type == SURF_NETWORK_ELEMENT_ROUTER || src_p->rc_type == SURF_NETWORK_ELEMENT_AS){
+ tmp_src_name = ROUTER_PEER(src);
+ src_ctn = xbt_lib_get_or_null(as_router_lib, tmp_src_name, COORD_ASR_LEVEL);
+ }
+ else{
+ xbt_die(" ");
+ }
- if(dst_ctn == NULL || src_ctn == NULL)
- xbt_die("Coord src '%s' :%p dst '%s' :%p",src,src_ctn,dst,dst_ctn);
+ if(dst_p->rc_type == SURF_NETWORK_ELEMENT_HOST){
+ tmp_dst_name = HOST_PEER(dst);
+ 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);
+ }
+ else if(dst_p->rc_type == SURF_NETWORK_ELEMENT_ROUTER || dst_p->rc_type == SURF_NETWORK_ELEMENT_AS){
+ tmp_dst_name = ROUTER_PEER(dst);
+ dst_ctn = xbt_lib_get_or_null(as_router_lib, tmp_dst_name, COORD_ASR_LEVEL);
+ }
+ else{
+ xbt_die(" ");
+ }
+
+ xbt_assert(src_ctn,"No coordinate found for element '%s'",tmp_src_name);
+ xbt_assert(dst_ctn,"No coordinate found for element '%s'",tmp_dst_name);
+ free(tmp_src_name);
+ free(tmp_dst_name);
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 *)));
+ + fabs(xbt_dynar_get_as(src_ctn, 2, double))+fabs(xbt_dynar_get_as(dst_ctn, 2, double));
- //From .ms to .s
- return euclidean_dist / 1000;
+ if (lat)
+ *lat += euclidean_dist / 1000; //From .ms to .s
}
-static double vivaldi_get_latency (AS_t rc,const char *src, const char *dst, route_t e_route)
-{
- if(routing_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_route(e_route);
- return latency;
- } else {
- return base_vivaldi_get_latency(src,dst);
- }
-}
/* Creation routing model functions */
AS_t model_vivaldi_create(void)
{
- AS_t new_component = model_rulebased_create();
- new_component->get_route = vivaldi_get_route;
- new_component->get_latency = vivaldi_get_latency;
- return new_component;
+ AS_t new_component = model_rulebased_create();
+ new_component->get_route_and_latency = vivaldi_get_route_and_latency;
+ return new_component;
}
