X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/014fb38c9ecb8a27235f32c4cd47de6abe3cb3ef..dc6913c52605e309e5bbbf3bcccec1e15a1ae03b:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 7253143759..583028ea24 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -419,22 +419,20 @@ 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 *wanted_routing_type)
 {
   routing_component_t new_routing;
   model_type_t model = NULL;
-  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))
+    if (!strcmp(wanted_routing_type, routing_models[cpt].name))
       model = &routing_models[cpt];
   /* if its not exist, error */
   if (model == NULL) {
     fprintf(stderr, "Routing model %s not found. Existing models:\n",
-            wanted);
+            wanted_routing_type);
     for (cpt = 0; routing_models[cpt].name; cpt++)
-      if (!strcmp(wanted, routing_models[cpt].name))
         fprintf(stderr, "   %s: %s\n", routing_models[cpt].name,
                 routing_models[cpt].desc);
     xbt_die(NULL);
@@ -487,17 +485,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)
+static void parse_S_AS(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)
-{
-  parse_S_AS(id, mode);
+  routing_AS_init(A_surfxml_AS_id, A_surfxml_AS_routing);
 }
 
 
@@ -507,11 +497,11 @@ 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) {
-    THROWF(arg_error, 0, "Close AS(%s), that never open", AS_id);
+    THROWF(arg_error, 0, "Close AS(%s), that were never opened", AS_id);
   } else {
     network_element_info_t info = NULL;
     xbt_assert(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL),
@@ -532,17 +522,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 +970,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);
@@ -2131,21 +2113,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