X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8353ca761ac086a2dffa56a6b1c862f19b803879..b44da26f4ba2a02d3fa88ed96214f1afa29185ba:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 3cd7a0287c..9188a557c2 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -419,13 +419,13 @@ static void parse_E_bypassRoute_store_route(void)
  * make the new structure and
  * set the parsing functions to allows parsing the part of the routing tree
  */
-static void parse_S_AS(char *AS_id, char *AS_routing)
+void routing_AS_init(const char *AS_id, const char *AS_routing)
 {
   routing_component_t new_routing;
   model_type_t model = NULL;
-  char *wanted = AS_routing;
+  const char *wanted = AS_routing;
   int cpt;
-  /* seach the routing model */
+  /* search the routing model */
   for (cpt = 0; routing_models[cpt].name; cpt++)
     if (!strcmp(wanted, routing_models[cpt].name))
       model = &routing_models[cpt];
@@ -487,17 +487,9 @@ static void parse_S_AS(char *AS_id, char *AS_routing)
 /*
  * Detect the routing model type of the routing component from XML platforms
  */
-static void parse_S_AS_XML(void)
-{
-  parse_S_AS(A_surfxml_AS_id, A_surfxml_AS_routing);
-}
-
-/*
- * define the routing model type of routing component from lua script
- */
-static void parse_S_AS_lua(char *id, char *mode)
+static void parse_S_AS(void)
 {
-  parse_S_AS(id, mode);
+  routing_AS_init(A_surfxml_AS_id, A_surfxml_AS_routing);
 }
 
 
@@ -507,7 +499,7 @@ static void parse_S_AS_lua(char *id, char *mode)
  * When you finish to read the routing component, other structures must be created. 
  * the "end" method allow to do that for any routing model type
  */
-static void parse_E_AS(const char *AS_id)
+void routing_AS_end(const char *AS_id)
 {
 
   if (current_routing == NULL) {
@@ -532,17 +524,9 @@ static void parse_E_AS(const char *AS_id)
 /*
  * \brief Finish the creation of a new routing component from XML
  */
-static void parse_E_AS_XML(void)
-{
-  parse_E_AS(A_surfxml_AS_id);
-}
-
-/*
- * \brief Finish the creation of a new routing component from lua
- */
-static void parse_E_AS_lua(const char *id)
+static void parse_E_AS(void)
 {
-  parse_E_AS(id);
+  routing_AS_end(A_surfxml_AS_id);
 }
 
 /* Aux Business methods */
@@ -988,8 +972,8 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_
   surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list,
                        &parse_E_bypassRoute_store_route);
 
-  surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS_XML);
-  surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML);
+  surfxml_add_callback(STag_surfxml_AS_cb_list, &parse_S_AS);
+  surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS);
 
   surfxml_add_callback(STag_surfxml_cluster_cb_list,
                        &routing_parse_Scluster);
@@ -1694,7 +1678,7 @@ void routing_parse_Scluster(void)
   SURFXML_START_TAG(router);
   SURFXML_END_TAG(router);
 
-  if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){
+  if( strcmp(struct_cluster->S_cluster_bb_bw,"")  && strcmp(struct_cluster->S_cluster_bb_lat,"")  ){
   char *link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id);
   XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,struct_cluster->S_cluster_bb_bw, struct_cluster->S_cluster_bb_lat);
   A_surfxml_link_state = A_surfxml_link_state_ON;
@@ -1740,7 +1724,7 @@ void routing_parse_Scluster(void)
   A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
   SURFXML_START_TAG(route);
 
-  if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){
+  if( strcmp(struct_cluster->S_cluster_bb_bw,"")  && strcmp(struct_cluster->S_cluster_bb_lat,"")  ){
   XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
   SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
   A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
@@ -1767,7 +1751,7 @@ void routing_parse_Scluster(void)
   SURFXML_START_TAG(link_ctn);
   SURFXML_END_TAG(link_ctn);
 
-  if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){
+  if( strcmp(struct_cluster->S_cluster_bb_bw,"")  && strcmp(struct_cluster->S_cluster_bb_lat,"")  ){
   XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
   SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
   A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
@@ -1786,7 +1770,7 @@ void routing_parse_Scluster(void)
   A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
   SURFXML_START_TAG(route);
 
-  if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){
+  if( strcmp(struct_cluster->S_cluster_bb_bw,"")  && strcmp(struct_cluster->S_cluster_bb_lat,"")  ){
   XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
   SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
   A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
@@ -1821,7 +1805,7 @@ void routing_parse_Scluster(void)
   SURFXML_START_TAG(link_ctn);
   SURFXML_END_TAG(link_ctn);
 
-  if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){
+  if( strcmp(struct_cluster->S_cluster_bb_bw,"")  && strcmp(struct_cluster->S_cluster_bb_lat,"")  ){
   XBT_DEBUG("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
   SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
   A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
@@ -2131,21 +2115,6 @@ static void routing_parse_Erandom(void)
  * New methods to init the routing model component from the lua script
  */
 
-/*
- * calling parse_S_AS_lua with lua values
- */
-void routing_AS_init(const char *AS_id, const char *AS_routing)
-{
-  parse_S_AS_lua((char *) AS_id, (char *) AS_routing);
-}
-
-/*
- * calling parse_E_AS_lua to fisnish the creation of routing component
- */
-void routing_AS_end(const char *AS_id)
-{
-  parse_E_AS_lua((char *) AS_id);
-}
 
 /*
  * add a host to the network element list