X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8cc10e99f53995bc7486e4467b4e6ad8d7be3460..2393024691b60fb2054ced4a41d146759091136c:/src/surf/surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index d1a77e1a39..f3c23703d0 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -70,25 +70,25 @@ typedef enum {
 struct s_model_type routing_models[] = {
   {"Full",
    "Full routing data (fast, large memory requirements, fully expressive)",
-   model_full_create, NULL,NULL, model_full_end},
+   model_full_create, model_full_end},
   {"Floyd",
    "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
-   model_floyd_create, NULL,NULL, model_floyd_end},
+   model_floyd_create, model_floyd_end},
   {"Dijkstra",
    "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
-   model_dijkstra_create, NULL,NULL, model_dijkstra_both_end},
+   model_dijkstra_create, model_dijkstra_both_end},
   {"DijkstraCache",
    "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
-   model_dijkstracache_create, NULL,NULL, model_dijkstra_both_end},
+   model_dijkstracache_create, model_dijkstra_both_end},
   {"none", "No routing (usable with Constant network only)",
-   model_none_create, NULL, NULL, NULL},
+   model_none_create,  NULL},
   {"RuleBased", "Rule-Based routing data (...)",
-   model_rulebased_create, NULL, NULL, NULL},
+   model_rulebased_create, NULL},
   {"Vivaldi", "Vivaldi routing",
-   model_vivaldi_create, NULL, NULL, NULL},
+   model_vivaldi_create, NULL},
   {"Cluster", "Cluster routing",
-   model_cluster_create, NULL, NULL, NULL},
-  {NULL, NULL, NULL, NULL, NULL, NULL}
+   model_cluster_create, NULL},
+  {NULL, NULL, NULL, NULL}
 };
 
 /**
@@ -298,8 +298,6 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
   model_type_t model = NULL;
   int cpt;
 
-  surf_parse_models_setup();    /* ensure that the models are created after the last <config> tag and before the first <AS>-like */
-
   /* search the routing model */
   for (cpt = 0; routing_models[cpt].name; cpt++)
     if (!strcmp(wanted_routing_type, routing_models[cpt].name))
@@ -342,16 +340,9 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type)
                  (void *) new_routing, NULL);
     /* add to the father element list */
     (*(current_routing->parse_AS)) (current_routing, AS_id);
-    /* unload the prev parse rules */
-    if (current_routing->routing->unload)
-      (*(current_routing->routing->unload)) ();
-
   } else {
     THROWF(arg_error, 0, "All defined components must be belong to a AS");
   }
-  /* set the new parse rules */
-  if (new_routing->routing->load)
-    (*(new_routing->routing->load)) ();
   /* set the new current component of the tree */
   current_routing = new_routing;
 }
@@ -383,13 +374,9 @@ void routing_AS_end()
     xbt_lib_set(as_router_lib, current_routing->name, ROUTING_ASR_LEVEL,
                 (void *) info);
 
-    if (current_routing->routing->unload)
-      (*(current_routing->routing->unload)) ();
     if (current_routing->routing->end)
       (*(current_routing->routing->end)) ();
     current_routing = current_routing->routing_father;
-    if (current_routing != NULL && current_routing->routing->load != NULL)
-      (*(current_routing->routing->load)) ();
   }
 }
 
@@ -700,19 +687,6 @@ static double get_latency(const char *src, const char *dst)
   return latency;
 }
 
-static int surf_parse_models_setup_already_called = 0;
-/* Call the last initialization functions, that must be called after the
- * <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
- */
-void surf_parse_models_setup()
-{
-  if (surf_parse_models_setup_already_called)
-    return;
-  surf_parse_models_setup_already_called = 1;
-  surf_config_models_setup();
-}
-
-
 /**
  * \brief Recursive function for finalize
  *
@@ -744,7 +718,7 @@ static void _finalize(routing_component_t rc)
  * \brief Generic method: delete all the routing structures
  * 
  * walk through the routing components tree and delete the structures
- * by calling the differents "finalize" functions in each routing component
+ * by calling the different "finalize" functions in each routing component
  */
 static void finalize(void)
 {
@@ -754,8 +728,6 @@ static void finalize(void)
   xbt_dynar_free(&(global_routing->last_route));
   /* delete global routing structure */
   xbt_free(global_routing);
-  /* make sure that we will reinit the models while loading the platf once reinited -- HACK but there is no proper surf_routing_init() */
-  surf_parse_models_setup_already_called = 0;
 }
 
 static xbt_dynar_t recursive_get_onelink_routes(routing_component_t rc)