From 3d5fcf57463d4f1419ad0bfb509461cb14b1e43d Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Tue, 1 Dec 2015 16:54:49 +0100
Subject: [PATCH] [surf] Remove sg_platf_peer_cb

---
 src/include/simgrid/platf_interface.h |  1 -
 src/surf/sg_platf.cpp                 | 13 -------------
 src/surf/surf_routing.cpp             |  4 +---
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h
index e983b0f977..f2196513ae 100644
--- a/src/include/simgrid/platf_interface.h
+++ b/src/include/simgrid/platf_interface.h
@@ -48,7 +48,6 @@ XBT_PUBLIC(void) sg_platf_gpu_add_cb(sg_platf_gpu_cb_t);
 /* ***************************************** */
 
 XBT_PUBLIC(void) sg_platf_link_add_cb(sg_platf_link_cb_t);
-XBT_PUBLIC(void) sg_platf_peer_add_cb(sg_platf_peer_cb_t fct);
 XBT_PUBLIC(void) sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct);
 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);
diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index aad3375fc8..a1b0a465fd 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -20,7 +20,6 @@
 
 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
@@ -54,7 +53,6 @@ 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);
@@ -78,7 +76,6 @@ 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);
@@ -181,13 +178,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;
@@ -540,9 +530,6 @@ 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);
 }
diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index 439f9d8774..d63995d660 100644
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -75,7 +75,6 @@ As* routing_get_current()
   return current_routing;
 }
 
-static void routing_parse_peer(sg_platf_peer_cbarg_t peer);     /* peer bypass */
 // static void routing_parse_Srandom(void);        /* random bypass */
 
 static void routing_parse_postparse(void);
@@ -1029,7 +1028,7 @@ static void routing_parse_postparse(void) {
   xbt_dict_free(&random_value);
 }
 
-static void routing_parse_peer(sg_platf_peer_cbarg_t peer)
+void sg_platf_new_peer(sg_platf_peer_cbarg_t peer)
 {
   char *host_id = NULL;
   char *link_id = NULL;
@@ -1259,7 +1258,6 @@ void routing_register_callbacks()
   sg_platf_cluster_add_cb(routing_parse_cluster);
   sg_platf_cabinet_add_cb(routing_parse_cabinet);
 
-  sg_platf_peer_add_cb(routing_parse_peer);
   sg_platf_postparse_add_cb(routing_parse_postparse);
   sg_platf_postparse_add_cb(check_disk_attachment);
 
-- 
2.20.1