[surf] Remove sg_platf_route_cb

diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h
index f219651..999475c 100644 (file)
--- a/src/include/simgrid/platf_interface.h
+++ b/src/include/simgrid/platf_interface.h
@@ -53,7 +53,6 @@ XBT_PUBLIC(void) sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct);
 XBT_PUBLIC(void) sg_platf_postparse_add_cb(void_f_void_t fct);
 XBT_PUBLIC(void) sg_platf_prop_add_cb(sg_platf_prop_cb_t fct);
 
-XBT_PUBLIC(void) sg_platf_route_add_cb(sg_platf_route_cb_t);
 XBT_PUBLIC(void) sg_platf_ASroute_add_cb(sg_platf_route_cb_t);
 XBT_PUBLIC(void) sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t);
 XBT_PUBLIC(void) sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t);

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index a1b0a46..27b1c1f 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -25,7 +25,6 @@ xbt_dynar_t sg_platf_cabinet_cb_list = NULL; // of sg_platf_cluster_cb_t
 xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t
 xbt_dynar_t sg_platf_prop_cb_list = NULL; // of sg_platf_prop_cb_t
 
-xbt_dynar_t sg_platf_route_cb_list = NULL; // of sg_platf_route_cb_t
 xbt_dynar_t sg_platf_ASroute_cb_list = NULL; // of sg_platf_ASroute_cb_t
 xbt_dynar_t sg_platf_bypassRoute_cb_list = NULL; // of sg_platf_bypassRoute_cb_t
 xbt_dynar_t sg_platf_bypassASroute_cb_list = NULL; // of sg_platf_bypassASroute_cb_t
@@ -58,7 +57,6 @@ void sg_platf_init(void) {
   sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL);
   sg_platf_prop_cb_list = xbt_dynar_new(sizeof(sg_platf_prop_cb_t),NULL);
 
-  sg_platf_route_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
   sg_platf_ASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
   sg_platf_bypassRoute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
   sg_platf_bypassASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
@@ -83,7 +81,6 @@ void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_trace_cb_list);
   xbt_dynar_free(&sg_platf_trace_connect_cb_list);
 
-  xbt_dynar_free(&sg_platf_route_cb_list);
   xbt_dynar_free(&sg_platf_ASroute_cb_list);
   xbt_dynar_free(&sg_platf_bypassRoute_cb_list);
   xbt_dynar_free(&sg_platf_bypassASroute_cb_list);
@@ -314,13 +311,11 @@ void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){
   xbt_dynar_push(mount_list, &mnt);
 }
 
-void sg_platf_new_route(sg_platf_route_cbarg_t route) {
-  unsigned int iterator;
-  sg_platf_route_cb_t fun;
-  xbt_dynar_foreach(sg_platf_route_cb_list, iterator, fun) {
-    fun(route);
-  }
+void sg_platf_new_route(sg_platf_route_cbarg_t route)
+{
+  routing_get_current()->parseRoute(route);
 }
+
 void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute) {
   unsigned int iterator;
   sg_platf_route_cb_t fun;
@@ -539,9 +534,6 @@ void sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct) {
 void sg_platf_postparse_add_cb(void_f_void_t fct) {
   xbt_dynar_push(sg_platf_postparse_cb_list, &fct);
 }
-void sg_platf_route_add_cb(sg_platf_route_cb_t fct) {
-  xbt_dynar_push(sg_platf_route_cb_list, &fct);
-}
 void sg_platf_ASroute_add_cb(sg_platf_route_cb_t fct) {
   xbt_dynar_push(sg_platf_ASroute_cb_list, &fct);
 }

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index d63995d..90fb47c 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -194,18 +194,6 @@ RoutingEdge *routing_add_host(As* current_routing, sg_platf_host_cbarg_t host)
   return routingEdge;
 }
 
-/**
- * \brief Store the route by calling the set_route function of the current routing component
- */
-static void parse_E_route(sg_platf_route_cbarg_t route)
-{
-  /*FIXME:REMOVE:xbt_assert(current_routing->parse_route,
-             "no defined method \"set_route\" in \"%s\"",
-             current_routing->name);*/
-
-  current_routing->parseRoute(route);
-}
-
 /**
  * \brief Store the ASroute by calling the set_ASroute function of the current routing component
  */
@@ -1250,7 +1238,6 @@ static void check_disk_attachment()
 
 void routing_register_callbacks()
 {
-  sg_platf_route_add_cb(parse_E_route);
   sg_platf_ASroute_add_cb(parse_E_ASroute);
   sg_platf_bypassRoute_add_cb(parse_E_bypassRoute);
   sg_platf_bypassASroute_add_cb(parse_E_bypassASroute);