Use the none routing as an ancestor to the generic one, which is ancestor to most...

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

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 658d80c..f20ed82 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -37,7 +37,6 @@ static xbt_dict_t random_value = NULL;
 /* Global vars */
 routing_global_t global_routing = NULL;
 AS_t current_routing = NULL;
-routing_model_description_t current_routing_model = NULL;
 
 /* global parse functions */
 xbt_dynar_t link_list = NULL;   /* temporary store of current list link of a route */
@@ -374,7 +373,7 @@ void routing_AS_end()
                 (void *) info);
 
     if (current_routing->routing->end)
-      (*(current_routing->routing->end)) ();
+      (*(current_routing->routing->end)) (current_routing);
     current_routing = current_routing->routing_father;
   }
 }
@@ -595,18 +594,20 @@ static void _get_route_latency(const char *src, const char *dst,
 static void get_route_latency(const char *src, const char *dst,
                               xbt_dynar_t * route, double *latency, int cleanup)
 {
+  static xbt_dynar_t last_route = NULL;
+
   _get_route_latency(src, dst, route, latency);
   xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst);
   xbt_assert(!latency || *latency >= 0.0,
              "latency error on route between \"%s\" and \"%s\"", src, dst);
   if (route) {
-    xbt_dynar_free(&global_routing->last_route);
-    global_routing->last_route = cleanup ? *route : NULL;
+    xbt_dynar_free(&last_route);
+    last_route = cleanup ? *route : NULL;
   }
 }
 
 /**
- * \brief Generic method: find a route between hosts
+ * \brief Find a route between hosts
  *
  * \param src the source host name 
  * \param dst the destination host name
@@ -615,34 +616,12 @@ static void get_route_latency(const char *src, const char *dst,
  * by calling the differents "get_route" functions in each routing component.
  * No need to free the returned dynar. It will be freed at the next call.
  */
-static xbt_dynar_t get_route(const char *src, const char *dst)
-{
+xbt_dynar_t routing_get_route(const char *src, const char *dst) {
   xbt_dynar_t route = NULL;
   get_route_latency(src, dst, &route, NULL, 1);
   return route;
 }
 
-/**
- * \brief Generic method: find a route between hosts
- *
- * \param src the source host name
- * \param dst the destination host name
- *
- * same as get_route, but return NULL if any exception is raised.
- */
-static xbt_dynar_t get_route_or_null(const char *src, const char *dst)
-{
-  xbt_dynar_t route = NULL;
-  xbt_ex_t exception;
-  TRY {
-    get_route_latency(src, dst, &route, NULL, 1);
-  } CATCH(exception) {
-    xbt_ex_free(exception);
-    return NULL;
-  }
-  return route;
-}
-
 /**
  * \brief Generic method: find a route between hosts
  *
@@ -660,45 +639,6 @@ static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst)
   return route;
 }
 
-static double get_latency(const char *src, const char *dst) {
-  double latency = -1.0;
-  get_route_latency(src, dst, NULL, &latency, 0);
-  return latency;
-}
-
-/**
- * \brief Recursive function for finalize
- *
- * \param rc the source host name 
- * 
- * This fuction is call by "finalize". It allow to finalize the 
- * AS or routing components. It delete all the structures.
- */
-static void finalize_rec(AS_t as) {
-  xbt_dict_cursor_t cursor = NULL;
-  char *key;
-  AS_t elem;
-
-  xbt_dict_foreach(as->routing_sons, cursor, key, elem)
-  finalize_rec(elem);
-
-  xbt_dict_free(&as->routing_sons);
-  xbt_free(as->name);
-  as->finalize(as);
-}
-
-/**
- * \brief Generic method: delete all the routing structures
- * 
- * walk through the routing components tree and delete the structures
- * by calling the different "finalize" functions in each routing component
- */
-static void finalize(void) {
-  finalize_rec(global_routing->root);
-  xbt_dynar_free(&global_routing->last_route);
-  xbt_free(global_routing);
-}
-
 static xbt_dynar_t recursive_get_onelink_routes(AS_t rc)
 {
   xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
@@ -732,7 +672,7 @@ static xbt_dynar_t get_onelink_routes(void)
   return recursive_get_onelink_routes(global_routing->root);
 }
 
-e_surf_network_element_type_t get_network_element_type(const char *name)
+e_surf_network_element_type_t routing_get_network_element_type(const char *name)
 {
   network_element_info_t rc = NULL;
 
@@ -757,17 +697,11 @@ void routing_model_create(size_t size_of_links, void *loopback)
   /* config the uniq global routing */
   global_routing = xbt_new0(s_routing_global_t, 1);
   global_routing->root = NULL;
-  global_routing->get_route = get_route;
-  global_routing->get_route_or_null = get_route_or_null;
-  global_routing->get_latency = get_latency;
   global_routing->get_route_no_cleanup = get_route_no_cleanup;
   global_routing->get_onelink_routes = get_onelink_routes;
   global_routing->get_route_latency = get_route_latency;
-  global_routing->get_network_element_type = get_network_element_type;
-  global_routing->finalize = finalize;
   global_routing->loopback = loopback;
   global_routing->size_of_link = size_of_links;
-  global_routing->last_route = NULL;
   /* no current routing at moment */
   current_routing = NULL;
 }
@@ -1274,3 +1208,32 @@ void routing_register_callbacks()
   instr_routing_define_callbacks();
 #endif
 }
+
+/**
+ * \brief Recursive function for finalize
+ *
+ * \param rc the source host name
+ *
+ * This fuction is call by "finalize". It allow to finalize the
+ * AS or routing components. It delete all the structures.
+ */
+static void finalize_rec(AS_t as) {
+  xbt_dict_cursor_t cursor = NULL;
+  char *key;
+  AS_t elem;
+
+  xbt_dict_foreach(as->routing_sons, cursor, key, elem)
+  finalize_rec(elem);
+
+  xbt_dict_free(&as->routing_sons);
+  xbt_free(as->name);
+  as->finalize(as);
+}
+
+/** \brief Frees all memory allocated by the routing module */
+void routing_exit(void) {
+  if (!global_routing)
+    return;
+  finalize_rec(global_routing->root);
+  xbt_free(global_routing);
+}