[surf] Remove sg_platf_bypass{,AS}Route_cb

diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h
index fb4ba08..5041b61 100644 (file)
--- a/src/include/simgrid/platf_interface.h
+++ b/src/include/simgrid/platf_interface.h
@@ -52,8 +52,6 @@ XBT_PUBLIC(void) sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct);
 XBT_PUBLIC(void) sg_platf_postparse_add_cb(void_f_void_t fct);
 
 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);
 
 XBT_PUBLIC(void) sg_platf_trace_add_cb(sg_platf_trace_cb_t);
 

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 134f739..ef3da4e 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -24,8 +24,6 @@ xbt_dynar_t sg_platf_cluster_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_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
 
 /* ***************************************** */
 /* TUTORIAL: New TAG                         */
@@ -51,8 +49,6 @@ void sg_platf_init(void) {
   sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_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);
 
   /* ***************************************** */
   /* TUTORIAL: New TAG                         */
@@ -67,8 +63,6 @@ void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_cluster_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);
 
   /* ***************************************** */
   /* TUTORIAL: New TAG                         */
@@ -295,26 +289,23 @@ 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) {
+void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute)
+{
   unsigned int iterator;
   sg_platf_route_cb_t fun;
   xbt_dynar_foreach(sg_platf_ASroute_cb_list, iterator, fun) {
     fun(ASroute);
   }
 }
-void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) {
-  unsigned int iterator;
-  sg_platf_route_cb_t fun;
-  xbt_dynar_foreach(sg_platf_bypassRoute_cb_list, iterator, fun) {
-    fun(bypassRoute);
-  }
+
+void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute)
+{
+  routing_get_current()->parseBypassroute(bypassRoute);
 }
-void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) {
-  unsigned int iterator;
-  sg_platf_route_cb_t fun;
-  xbt_dynar_foreach(sg_platf_bypassASroute_cb_list, iterator, fun) {
-    fun(bypassASroute);
-  }
+
+void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute)
+{
+  routing_get_current()->parseBypassroute(bypassASroute);
 }
 
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
@@ -492,12 +483,7 @@ void sg_platf_postparse_add_cb(void_f_void_t fct) {
 void sg_platf_ASroute_add_cb(sg_platf_route_cb_t fct) {
   xbt_dynar_push(sg_platf_ASroute_cb_list, &fct);
 }
-void sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t fct) {
-  xbt_dynar_push(sg_platf_bypassRoute_cb_list, &fct);
-}
-void sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t fct) {
-  xbt_dynar_push(sg_platf_bypassASroute_cb_list, &fct);
-}
+
 void sg_platf_rng_stream_init(unsigned long seed[6]) {
   RngStream_SetPackageSeed(seed);
   sg_platf_rng_stream = RngStream_CreateStream(NULL);

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index b41f4aa..d379e6f 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -205,29 +205,6 @@ static void parse_E_ASroute(sg_platf_route_cbarg_t ASroute)
   current_routing->parseASroute(ASroute);
 }
 
-/**
- * \brief Store the bypass route by calling the set_bypassroute function of the current routing component
- */
-static void parse_E_bypassRoute(sg_platf_route_cbarg_t route)
-{
-  /*FIXME:REMOVE:xbt_assert(current_routing->parse_bypassroute,
-             "Bypassing mechanism not implemented by routing '%s'",
-             current_routing->name);*/
-
-  current_routing->parseBypassroute(route);
-}
-
-/**
- * \brief Store the bypass route by calling the set_bypassroute function of the current routing component
- */
-static void parse_E_bypassASroute(sg_platf_route_cbarg_t ASroute)
-{
-  /*FIXME:REMOVE:xbt_assert(current_routing->parse_bypassroute,
-             "Bypassing mechanism not implemented by routing '%s'",
-             current_routing->name);*/
-  current_routing->parseBypassroute(ASroute);
-}
-
 void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
 {
   tmgr_trace_t tmgr_trace;
@@ -1239,8 +1216,6 @@ static void check_disk_attachment()
 void routing_register_callbacks()
 {
   sg_platf_ASroute_add_cb(parse_E_ASroute);
-  sg_platf_bypassRoute_add_cb(parse_E_bypassRoute);
-  sg_platf_bypassASroute_add_cb(parse_E_bypassASroute);
 
   sg_platf_cluster_add_cb(routing_parse_cluster);