X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/445590fd865f35e74be34955931c97b8956f6d7f..aea5cd54d7bc57803095a419ce5e9f1765634921:/src/surf/surf_routing_floyd.c

diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c
index 28f4f6c4c2..6ee25f3c12 100644
--- a/src/surf/surf_routing_floyd.c
+++ b/src/surf/surf_routing_floyd.c
@@ -32,31 +32,35 @@ static void floyd_get_route_and_latency(AS_t asg, network_element_t src, network
 static xbt_dynar_t floyd_get_onelink_routes(AS_t asg)
 {
   xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
-  THROW_UNIMPLEMENTED;
-//  route_t route =   xbt_new0(s_route_t, 1);
-//  route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
-//
-//  xbt_dict_cursor_t c1 = NULL, c2 = NULL;
-//  char *k1, *d1, *k2, *d2;
-//  xbt_dict_foreach(asg->to_index, c1, k1, d1) {
-//    xbt_dict_foreach(asg->to_index, c2, k2, d2) {
-//      xbt_dynar_reset(route->link_list);
-//      floyd_get_route_and_latency(asg, k1, k2, route, NULL);
-//      if (xbt_dynar_length(route->link_list) == 1) {
-//        void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
-//        onelink_t onelink = xbt_new0(s_onelink_t, 1);
-//        onelink->link_ptr = link;
-//        if (asg->hierarchy == SURF_ROUTING_BASE) {
-//          onelink->src = xbt_strdup(k1);
-//          onelink->dst = xbt_strdup(k2);
-//        } else if (asg->hierarchy == SURF_ROUTING_RECURSIVE) {
-//          onelink->src = route->src_gateway;
-//          onelink->dst = route->dst_gateway;
-//        }
-//        xbt_dynar_push(ret, &onelink);
-//      }
-//    }
-//  }
+  route_t route =   xbt_new0(s_route_t, 1);
+  route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+
+  int src,dst;
+  network_element_t src_elm, dst_elm;
+  int table_size = xbt_dynar_length(asg->index_network_elm);
+  for(src=0; src < table_size; src++) {
+    for(dst=0; dst< table_size; dst++) {
+      xbt_dynar_reset(route->link_list);
+      src_elm = xbt_dynar_get_as(asg->index_network_elm,src,network_element_t);
+      dst_elm = xbt_dynar_get_as(asg->index_network_elm,dst,network_element_t);
+      floyd_get_route_and_latency(asg, src_elm, dst_elm, route, NULL);
+
+      if (xbt_dynar_length(route->link_list) == 1) {
+        void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
+        onelink_t onelink = xbt_new0(s_onelink_t, 1);
+        onelink->link_ptr = link;
+        if (asg->hierarchy == SURF_ROUTING_BASE) {
+          onelink->src = src_elm;
+          onelink->dst = dst_elm;
+        } else if (asg->hierarchy == SURF_ROUTING_RECURSIVE) {
+          onelink->src = route->src_gateway;
+          onelink->dst = route->dst_gateway;
+        }
+        xbt_dynar_push(ret, &onelink);
+      }
+    }
+  }
+
   return ret;
 }
 
@@ -66,7 +70,7 @@ static void floyd_get_route_and_latency(AS_t asg, network_element_t src, network
 
   /* set utils vars */
   as_floyd_t as = (as_floyd_t)asg;
-  size_t table_size = asg->nb_index;
+  size_t table_size = xbt_dynar_length(asg->index_network_elm);
 
   generic_src_dst_check(asg, src, dst);
   int *src_id = &(src->id);
@@ -108,7 +112,7 @@ static void floyd_get_route_and_latency(AS_t asg, network_element_t src, network
     if (asg->hierarchy == SURF_ROUTING_RECURSIVE && !first
         && strcmp(gw_dst->name, prev_gw_src->name)) {
       xbt_dynar_t e_route_as_to_as;
-      e_route_as_to_as = xbt_dynar_new(global_routing->size_of_link, NULL);
+      e_route_as_to_as = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
       routing_get_route_and_latency(gw_dst, prev_gw_src,&e_route_as_to_as,NULL);
       links = e_route_as_to_as;
       int pos = 0;
@@ -147,7 +151,7 @@ static void floyd_finalize(AS_t rc)
   int i, j;
   size_t table_size;
   if (as) {
-    table_size = as->generic_routing.nb_index;
+    table_size = xbt_dynar_length(as->generic_routing.index_network_elm);
     /* Delete link_table */
     for (i = 0; i < table_size; i++)
       for (j = 0; j < table_size; j++)
@@ -184,7 +188,7 @@ void model_floyd_end(AS_t current_routing)
 	unsigned int i, j, a, b, c;
 
 	/* set the size of table routing */
-	size_t table_size = as->generic_routing.nb_index;
+	size_t table_size = xbt_dynar_length(as->generic_routing.index_network_elm);
 
 	if(!as->link_table)
 	{
@@ -210,8 +214,7 @@ void model_floyd_end(AS_t current_routing)
 			e_route = xbt_new0(s_route_t, 1);
 			e_route->src_gateway = NULL;
 			e_route->dst_gateway = NULL;
-			e_route->link_list =
-				xbt_dynar_new(global_routing->size_of_link, NULL);
+			e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
 			xbt_dynar_push(e_route->link_list, &global_routing->loopback);
 			TO_FLOYD_LINK(i, i) = e_route;
 			TO_FLOYD_PRED(i, i) = i;
@@ -246,16 +249,19 @@ static int floyd_pointer_resource_cmp(const void *a, const void *b) {
 void model_floyd_parse_route(AS_t rc, const char *src,
         const char *dst, route_t route)
 {
-	as_floyd_t as = (as_floyd_t) rc;
+    int as_route = 0;
+    as_floyd_t as = (as_floyd_t) rc;
 
 	/* set the size of table routing */
-	size_t table_size = rc->nb_index;
+	size_t table_size = xbt_dynar_length(rc->index_network_elm);
     network_element_t src_net_elm, dst_net_elm;
 
-    src_net_elm = (network_element_t)xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL);
-    dst_net_elm = (network_element_t)xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL);
-    if(!src_net_elm) src_net_elm = (network_element_t)xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL);
-    if(!dst_net_elm) dst_net_elm = (network_element_t)xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL);
+    src_net_elm = xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL);
+    dst_net_elm = xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL);
+    if (!src_net_elm)
+      src_net_elm = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL);
+    if (!dst_net_elm)
+      dst_net_elm = xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL);
 
 	xbt_assert(src_net_elm, "Network elements %s not found", src);
 	xbt_assert(dst_net_elm, "Network elements %s not found", dst);
@@ -276,17 +282,24 @@ void model_floyd_parse_route(AS_t rc, const char *src,
 		  TO_FLOYD_LINK(i, j) = NULL;       /* fixed, missing in the previous version */
 		}
 	}
+    if(!route->dst_gateway && !route->src_gateway)
+      XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
+    else{
+        as_route = 1;
+        XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+             route->src_gateway->name, dst, route->dst_gateway->name);
+        if(route->dst_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL)
+            xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway->name);
+        if(route->src_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL)
+            xbt_die("The src_gateway '%s' does not exist!",route->src_gateway->name);
+    }
 
 	if(TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id))
 	{
-		if(!route->dst_gateway && !route->src_gateway)
-			XBT_DEBUG("See Route from \"%s\" to \"%s\"", src, dst);
-		else
-			XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-				 route->src_gateway->name, dst, route->dst_gateway->name);
+
 		char * link_name;
 		unsigned int cpt;
-		xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+		xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
 		xbt_dynar_foreach(route->link_list,cpt,link_name)
 		{
 			void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
@@ -301,16 +314,6 @@ void model_floyd_parse_route(AS_t rc, const char *src,
 	}
 	else
 	{
-		if(!route->dst_gateway && !route->src_gateway)
-		  XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
-		else{
-			XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
-				 route->src_gateway->name, dst, route->dst_gateway->name);
-			if(route->dst_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL)
-				xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway->name);
-			if(route->src_gateway->rc_type == SURF_NETWORK_ELEMENT_NULL)
-				xbt_die("The src_gateway '%s' does not exist!",route->src_gateway->name);
-		}
 	    TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id) =
 	    		generic_new_extended_route(rc->hierarchy, route, 1);
 	    TO_FLOYD_PRED(src_net_elm->id, dst_net_elm->id) = src_net_elm->id;
@@ -318,8 +321,9 @@ void model_floyd_parse_route(AS_t rc, const char *src,
 	    		((TO_FLOYD_LINK(src_net_elm->id, dst_net_elm->id))->link_list)->used;   /* count of links, old model assume 1 */
 	}
 
-	if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
-		|| A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
+    if ( (A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES && as_route == 0)
+         || (A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES && as_route == 1)
+       )
 	{
 		if(TO_FLOYD_LINK(dst_net_elm->id, src_net_elm->id))
 		{
@@ -330,7 +334,7 @@ void model_floyd_parse_route(AS_t rc, const char *src,
 					 route->src_gateway->name, src, route->dst_gateway->name);
 			char * link_name;
 			unsigned int i;
-			xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+			xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
 			for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--)
 			{
 				link_name = xbt_dynar_get_as(route->link_list,i-1,void *);