The code deal with <ASroute> in the exact same way than <route>. Disturbing

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index bdf0803..c9f920e 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -73,7 +73,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
   simgrid::surf::NetCard *netcard =
       new simgrid::surf::NetCardImpl(host->id, SURF_NETWORK_ELEMENT_HOST, current_routing);
 
-  netcard->setId(current_routing->parsePU(netcard));
+  netcard->setId(current_routing->addComponent(netcard));
   sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id);
   h->pimpl_netcard = netcard;
   simgrid::surf::netcardCreatedCallbacks(netcard);
@@ -130,7 +130,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
              router->id);
 
   simgrid::surf::NetCard *info = new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing);
-  info->setId(current_routing->parsePU(info));
+  info->setId(current_routing->addComponent(info));
   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info);
   XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId());
   simgrid::surf::netcardCreatedCallbacks(info);
@@ -516,21 +516,11 @@ void sg_platf_new_route(sg_platf_route_cbarg_t route)
   routing_get_current()->parseRoute(route);
 }
 
-void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute)
-{
-  routing_get_current()->parseASroute(ASroute);
-}
-
 void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
 {
   routing_get_current()->parseBypassroute(bypassRoute);
 }
 
-void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute)
-{
-  routing_get_current()->parseBypassroute(bypassASroute);
-}
-
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
 {
   if (!simix_global)
@@ -630,16 +620,10 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process)
 void sg_platf_route_begin (sg_platf_route_cbarg_t route){
   route->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
 }
-void sg_platf_ASroute_begin (sg_platf_route_cbarg_t ASroute){
-  ASroute->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
-}
 
 void sg_platf_route_end (sg_platf_route_cbarg_t route){
   sg_platf_new_route(route);
 }
-void sg_platf_ASroute_end (sg_platf_route_cbarg_t ASroute){
-  sg_platf_new_ASroute(ASroute);
-}
 
 void sg_platf_route_add_link (const char* link_id, sg_platf_route_cbarg_t route){
   char *link_name = xbt_strdup(link_id);