Use for push_as and get_as for dynar

diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c
index a34dc31..9a8a411 100644 (file)
--- a/src/surf/surf_routing_cluster.c
+++ b/src/surf/surf_routing_cluster.c
@@ -59,12 +59,14 @@ static void model_cluster_finalize(AS_t as) {
 }
 
 static int cluster_parse_PU(AS_t rc, network_element_t elm) {
 }
 
 static int cluster_parse_PU(AS_t rc, network_element_t elm) {

-  xbt_dynar_push(rc->index_network_elm, (void *)elm);
+  XBT_DEBUG("Load process unit \"%s\"", elm->name);
+  xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);

   return xbt_dynar_length(rc->index_network_elm)-1;
 }
 
 static int cluster_parse_AS(AS_t rc, network_element_t elm) {
   return xbt_dynar_length(rc->index_network_elm)-1;
 }
 
 static int cluster_parse_AS(AS_t rc, network_element_t elm) {

-  xbt_dynar_push(rc->index_network_elm, (void *)elm);
+  XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
+  xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);

   return xbt_dynar_length(rc->index_network_elm)-1;
 }
 
   return xbt_dynar_length(rc->index_network_elm)-1;
 }
 

diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c
index 1ac2f26..bafd2fa 100644 (file)
--- a/src/surf/surf_routing_full.c
+++ b/src/surf/surf_routing_full.c
@@ -38,17 +38,19 @@ static xbt_dynar_t full_get_onelink_routes(AS_t rc)
           void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0);
           onelink_t onelink = xbt_new0(s_onelink_t, 1);
           onelink->link_ptr = link;
           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 (routing->generic_routing.hierarchy == SURF_ROUTING_BASE) {
-            onelink->src = xbt_dynar_get_as(routing->generic_routing.index_network_elm,src,network_element_t);
+          if (rc->hierarchy == SURF_ROUTING_BASE) {
+            onelink->src = xbt_dynar_get_as(rc->index_network_elm,src,network_element_t);

             onelink->src->id = src;
             onelink->src->id = src;

-            onelink->dst = xbt_dynar_get_as(routing->generic_routing.index_network_elm,dst,network_element_t);
+            onelink->dst = xbt_dynar_get_as(rc->index_network_elm,dst,network_element_t);

             onelink->dst->id = dst;
             onelink->dst->id = dst;

-          } else if (routing->generic_routing.hierarchy ==
-                     SURF_ROUTING_RECURSIVE) {
+          } else if (rc->hierarchy == SURF_ROUTING_RECURSIVE) {

             onelink->src = route->src_gateway;
             onelink->dst = route->dst_gateway;
           }
           xbt_dynar_push(ret, &onelink);
             onelink->src = route->src_gateway;
             onelink->dst = route->dst_gateway;
           }
           xbt_dynar_push(ret, &onelink);

+          XBT_DEBUG("Push route from '%d' to '%d'",
+              src,
+              dst);

         }
       }
     }
         }
       }
     }

diff --git a/src/surf/surf_routing_generic.c b/src/surf/surf_routing_generic.c
index 4301a34..38cc16d 100644 (file)
--- a/src/surf/surf_routing_generic.c
+++ b/src/surf/surf_routing_generic.c
@@ -41,14 +41,14 @@ void model_generic_finalize(AS_t as) {
 int generic_parse_PU(AS_t as, network_element_t elm)
 {
   XBT_DEBUG("Load process unit \"%s\"", elm->name);
 int generic_parse_PU(AS_t as, network_element_t elm)
 {
   XBT_DEBUG("Load process unit \"%s\"", elm->name);

-  xbt_dynar_push(as->index_network_elm, elm);
+  xbt_dynar_push_as(as->index_network_elm,network_element_t,elm);

   return xbt_dynar_length(as->index_network_elm)-1;
 }
 
 int generic_parse_AS(AS_t as, network_element_t elm)
 {
   XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
   return xbt_dynar_length(as->index_network_elm)-1;
 }
 
 int generic_parse_AS(AS_t as, network_element_t elm)
 {
   XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);

-  xbt_dynar_push(as->index_network_elm, elm);
+  xbt_dynar_push_as(as->index_network_elm,network_element_t,elm);

   return xbt_dynar_length(as->index_network_elm)-1;
 }
 
   return xbt_dynar_length(as->index_network_elm)-1;
 }
 

diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index 726a873..d4a598d 100644 (file)
--- a/src/surf/surf_routing_none.c
+++ b/src/surf/surf_routing_none.c
@@ -24,13 +24,15 @@ static route_t none_get_bypass_route(AS_t rc,
 }
 
 static int none_parse_PU(AS_t rc, network_element_t elm) {
 }
 
 static int none_parse_PU(AS_t rc, network_element_t elm) {

-  xbt_dynar_push(rc->index_network_elm, (void *)elm);
+  XBT_DEBUG("Load process unit \"%s\"", elm->name);
+  xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);

   /* don't care about PUs */
   return -1;
 }
 
 static int none_parse_AS(AS_t rc, network_element_t elm) {
   /* don't care about PUs */
   return -1;
 }
 
 static int none_parse_AS(AS_t rc, network_element_t elm) {

-  xbt_dynar_push(rc->index_network_elm, (void *)elm);
+  XBT_DEBUG("Load Autonomous system \"%s\"", elm->name);
+  xbt_dynar_push_as(rc->index_network_elm,network_element_t,elm);

   /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
   return -1;
 }
   /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
   return -1;
 }