[surf] Remove sg_cabinet_cb

[simgrid.git] / src / surf / sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index aad3375..c64ce9d 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -20,13 +20,9 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 xbt_dynar_t sg_platf_link_cb_list = NULL;   // of sg_platf_link_cb_t
-xbt_dynar_t sg_platf_peer_cb_list = NULL; // of sg_platf_peer_cb_t
 xbt_dynar_t sg_platf_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t
-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
@@ -54,13 +50,9 @@ void sg_platf_init(void) {
     return; //Already initialized, so do nothing...
 
   sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL);
-  sg_platf_peer_cb_list = xbt_dynar_new(sizeof(sg_platf_peer_cb_t), NULL);
   sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL);
-  sg_platf_cabinet_cb_list = xbt_dynar_new(sizeof(sg_platf_cabinet_cb_t), NULL);
   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);
@@ -78,15 +70,11 @@ void sg_platf_init(void) {
 void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_link_cb_list);
   xbt_dynar_free(&sg_platf_postparse_cb_list);
-  xbt_dynar_free(&sg_platf_peer_cb_list);
   xbt_dynar_free(&sg_platf_cluster_cb_list);
-  xbt_dynar_free(&sg_platf_cabinet_cb_list);
-  xbt_dynar_free(&sg_platf_prop_cb_list);
 
   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);
@@ -181,13 +169,6 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){
   }
 }
 
-void sg_platf_new_peer(sg_platf_peer_cbarg_t peer){
-  unsigned int iterator;
-  sg_platf_peer_cb_t fun;
-  xbt_dynar_foreach(sg_platf_peer_cb_list, iterator, fun) {
-    fun(peer);
-  }
-}
 void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){
   unsigned int iterator;
   sg_platf_cluster_cb_t fun;
@@ -195,13 +176,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){
     fun(cluster);
   }
 }
-void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet){
-  unsigned int iterator;
-  sg_platf_cabinet_cb_t fun;
-  xbt_dynar_foreach(sg_platf_cabinet_cb_list, iterator, fun) {
-    fun(cabinet);
-  }
-}
+
 void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
 {
   xbt_assert(!xbt_lib_get_or_null(storage_lib, storage->id,ROUTING_STORAGE_LEVEL),
@@ -324,13 +299,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;
@@ -352,13 +325,6 @@ void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) {
     fun(bypassASroute);
   }
 }
-void sg_platf_new_prop(sg_platf_prop_cbarg_t prop) {
-  unsigned int iterator;
-  sg_platf_prop_cb_t fun;
-  xbt_dynar_foreach(sg_platf_prop_cb_list, iterator, fun) {
-    fun(prop);
-  }
-}
 void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) {
   unsigned int iterator;
   sg_platf_trace_cb_t fun;
@@ -540,21 +506,12 @@ void sg_platf_gpu_add_cb(sg_platf_gpu_cb_t fct) {
 void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
   xbt_dynar_push(sg_platf_link_cb_list, &fct);
 }
-void sg_platf_peer_add_cb(sg_platf_peer_cb_t fct) {
-  xbt_dynar_push(sg_platf_peer_cb_list, &fct);
-}
 void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) {
   xbt_dynar_push(sg_platf_cluster_cb_list, &fct);
 }
-void sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct) {
-  xbt_dynar_push(sg_platf_cabinet_cb_list, &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);
 }
@@ -564,9 +521,6 @@ void sg_platf_bypassRoute_add_cb(sg_platf_route_cb_t 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_prop_add_cb(sg_platf_prop_cb_t fct) {
-  xbt_dynar_push(sg_platf_prop_cb_list, &fct);
-}
 void sg_platf_trace_add_cb(sg_platf_trace_cb_t fct) {
   xbt_dynar_push(sg_platf_trace_cb_list, &fct);
 }