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 8156a97..c9f920e 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -67,13 +67,13 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
       "Refusing to create a second host named '%s'.", host->id);
 
   simgrid::surf::As* current_routing = routing_get_current();
-  if (current_routing->p_hierarchy == SURF_ROUTING_NULL)
-    current_routing->p_hierarchy = SURF_ROUTING_BASE;
+  if (current_routing->hierarchy_ == SURF_ROUTING_NULL)
+    current_routing->hierarchy_ = SURF_ROUTING_BASE;
 
   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);
@@ -123,14 +123,14 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
 {
   simgrid::surf::As* current_routing = routing_get_current();
 
-  if (current_routing->p_hierarchy == SURF_ROUTING_NULL)
-    current_routing->p_hierarchy = SURF_ROUTING_BASE;
+  if (current_routing->hierarchy_ == SURF_ROUTING_NULL)
+    current_routing->hierarchy_ = SURF_ROUTING_BASE;
   xbt_assert(!xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL),
              "Reading a router, processing unit \"%s\" already exists",
              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);
@@ -176,9 +176,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
   s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER;
 
   unsigned int iter;
-  int start, end, i;
-  xbt_dynar_t radical_elements;
-  xbt_dynar_t radical_ends;
 
   if ((cluster->availability_trace && strcmp(cluster->availability_trace, ""))
       || (cluster->state_trace && strcmp(cluster->state_trace, ""))) {
@@ -221,14 +218,13 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
   }
 
 
-  current_routing->p_linkUpDownList = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
-
   //Make all hosts
-  radical_elements = xbt_str_split(cluster->radical, ",");
+  xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ",");
   xbt_dynar_foreach(radical_elements, iter, groups) {
 
-    radical_ends = xbt_str_split(groups, "-");
-    start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
+    xbt_dynar_t radical_ends = xbt_str_split(groups, "-");
+    int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *));
+    int end;
 
     switch (xbt_dynar_length(radical_ends)) {
     case 1:
@@ -241,7 +237,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
       surf_parse_error("Malformed radical");
       break;
     }
-    for (i = start; i <= end; i++) {
+    for (int i = start; i <= end; i++) {
       host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix);
       link_id = bprintf("%s_link_%d", cluster->id, i);
 
@@ -319,7 +315,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
         info_loop.link_up   = Link::byName(tmp_link);
         info_loop.link_down = info_loop.link_up;
         free(tmp_link);
-        xbt_dynar_set(current_routing->p_linkUpDownList,
+        xbt_dynar_set(current_routing->upDownLinks,
           rankId*(static_cast<AsCluster*>(current_routing))->p_nb_links_per_node, &info_loop);
       }
 
@@ -341,7 +337,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
         info_lim.link_down = info_lim.link_up;
         free(tmp_link);
         auto as_cluster = static_cast<AsCluster*>(current_routing);
-        xbt_dynar_set(current_routing->p_linkUpDownList,
+        xbt_dynar_set(current_routing->upDownLinks,
             rankId*(as_cluster)->p_nb_links_per_node + as_cluster->p_has_loopback ,
             &info_lim);
 
@@ -520,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)
@@ -634,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);