Use for push_as and get_as for dynar

[simgrid.git] / src / surf / surf_routing_none.c

diff --git a/src/surf/surf_routing_none.c b/src/surf/surf_routing_none.c
index e4e187c..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;
 }


@@ -50,15 +52,15 @@ AS_t model_none_create_sized(size_t childsize) {
   new_component->get_onelink_routes = none_get_onelink_routes;
   new_component->get_bypass_route = none_get_bypass_route;
   new_component->finalize = model_none_finalize;
   new_component->get_onelink_routes = none_get_onelink_routes;
   new_component->get_bypass_route = none_get_bypass_route;
   new_component->finalize = model_none_finalize;

-

   new_component->routing_sons = xbt_dict_new_homogeneous(NULL);
   new_component->index_network_elm = xbt_dynar_new(sizeof(char*),NULL);
   new_component->routing_sons = xbt_dict_new_homogeneous(NULL);
   new_component->index_network_elm = xbt_dynar_new(sizeof(char*),NULL);

+

   return new_component;
 }
 
 void model_none_finalize(AS_t as) {
   xbt_dict_free(&as->routing_sons);
   return new_component;
 }
 
 void model_none_finalize(AS_t as) {
   xbt_dict_free(&as->routing_sons);

-  xbt_free(as->name);
+  xbt_dynar_free(&as->index_network_elm);

   xbt_free(as);
 }
 
   xbt_free(as);
 }