Kill the XML-level callbacks to AS_open/close and create some at sg_platf level instead

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 76ac3e8..be05319 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -151,17 +151,6 @@ static void parse_S_router(sg_platf_router_cbarg_t router)
   }
 }
 
-/**
- * brief Add a "router" to the network element list from XML description
- */
-static void parse_S_router_lua(const char* router_id) {
-  s_sg_platf_router_cbarg_t router;
-  memset(&router,0,sizeof(router));
-       router.id = router_id;
-       router.coord = "";
-       return parse_S_router(&router);
-}
-
 /**
  * \brief Set the endponints for a route
  */
@@ -187,14 +176,6 @@ static void parse_S_route_new_and_endpoints_XML(void)
                                   A_surfxml_route_dst);
 }
 
-/**
- * \brief Set the endpoints for a route from lua
- */
-static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst)
-{
-  parse_S_route_new_and_endpoints(id_src, id_dst);
-}
-
 /**
  * \brief Set the endponints and gateways for a ASroute
  */
@@ -264,14 +245,6 @@ static void parse_E_link_ctn_new_elem_XML(void)
   }
 }
 
-/**
- * \brief Set a new link on the actual list of link for a route or ASroute from lua
- */
-static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
-{
-  parse_E_link_ctn_new_elem(link_id);
-}
-
 /**
  * \brief Store the route by calling the set_route function of the current routing component
  */
@@ -339,10 +312,10 @@ static void parse_E_bypassRoute_store_route(void)
  * Once this function was called, the configuration concerning the used
  * models cannot be changed anymore.
  *
- * @param AS_id name of this autonomous system. Must be uniq in the platform
+ * @param AS_id name of this autonomous system. Must be unique in the platform
  * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
  */
-void sg_platf_new_AS_open(const char *AS_id, const char *wanted_routing_type)
+void routing_AS_open(const char *AS_id, const char *wanted_routing_type)
 {
   routing_component_t new_routing;
   model_type_t model = NULL;
@@ -415,7 +388,7 @@ void sg_platf_new_AS_open(const char *AS_id, const char *wanted_routing_type)
  * even if you add stuff to a closed AS
  *
  */
-void sg_platf_new_AS_close() {
+void routing_AS_close() {
 
   if (current_routing == NULL) {
     THROWF(arg_error, 0, "Close an AS, but none was under construction");
@@ -790,7 +763,7 @@ static void _finalize(routing_component_t rc)
  */
 static void finalize(void)
 {
-  /* delete recursibly all the tree */
+  /* delete recursively all the tree */
   _finalize(global_routing->root);
   /* delete last_route */
   xbt_dynar_free(&(global_routing->last_route));
@@ -1452,12 +1425,6 @@ void routing_parse_Scluster(void)
                XBT_DEBUG("</host>");
 
 
-               A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-               if(struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
-               {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FULLDUPLEX;}
-               if(struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
-               {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
-
                XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->bw, struct_cluster->lat);
 
                memset(&link,0,sizeof(link));
@@ -1466,24 +1433,21 @@ void routing_parse_Scluster(void)
                link.latency = struct_cluster->lat;
                link.state = SURF_RESOURCE_ON;
 
-               switch (A_surfxml_link_sharing_policy) {
-               case A_surfxml_link_sharing_policy_SHARED:
-                       link.policy = SURF_LINK_SHARED;
-                       break;
-               case A_surfxml_link_sharing_policy_FATPIPE:
+               switch (struct_cluster->sharing_policy) {
+               case A_surfxml_cluster_sharing_policy_FATPIPE:
                  link.policy = SURF_LINK_FATPIPE;
                  break;
-               case A_surfxml_link_sharing_policy_FULLDUPLEX:
+               case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
                  link.policy = SURF_LINK_FULLDUPLEX;
                  break;
-               case AU_surfxml_link_sharing_policy:
-                 surf_parse_error(bprintf("Invalid sharing policy in cluster %s (please report this bug, this shouldn't happen)",struct_cluster->id));
+               default:
+      link.policy = SURF_LINK_SHARED;
                }
 
                sg_platf_new_link(&link);
 
                surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
-               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
+               if (struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX){
                        char* tmp_link =  bprintf("%s_UP",link_id);
                        info->link_up   = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
                        free(tmp_link);
@@ -1917,4 +1881,3 @@ static void routing_parse_Srandom(void)
       xbt_dynar_free(&radical_elements);
     }
 }
-