From 94a170e381053a22750c59f5101c73ae263b3bf3 Mon Sep 17 00:00:00 2001
From: Gabriel Corona <gabriel.corona@loria.fr>
Date: Wed, 2 Dec 2015 11:19:37 +0100
Subject: [PATCH] [surf] Remove sg_trace_connect_cb

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

diff --git a/src/include/simgrid/platf_interface.h b/src/include/simgrid/platf_interface.h
index 2e031133b2..fb4ba08f89 100644
--- a/src/include/simgrid/platf_interface.h
+++ b/src/include/simgrid/platf_interface.h
@@ -56,7 +56,6 @@ 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);
-XBT_PUBLIC(void) sg_platf_trace_connect_add_cb(sg_platf_trace_connect_cb_t);
 
 /** \brief Pick the right models for CPU, net and host, and call their model_init_preparse
  *
diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index c64ce9d095..77aa1d5ec1 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -28,7 +28,6 @@ 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
 
 xbt_dynar_t sg_platf_trace_cb_list = NULL;
-xbt_dynar_t sg_platf_trace_connect_cb_list = NULL;
 
 /* ***************************************** */
 /* TUTORIAL: New TAG                         */
@@ -58,7 +57,6 @@ void sg_platf_init(void) {
   sg_platf_bypassASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
 
   sg_platf_trace_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_cb_t), NULL);
-  sg_platf_trace_connect_cb_list = xbt_dynar_new(sizeof(sg_platf_trace_connect_cb_t), NULL);
 
   /* ***************************************** */
   /* TUTORIAL: New TAG                         */
@@ -73,7 +71,6 @@ void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_cluster_cb_list);
 
   xbt_dynar_free(&sg_platf_trace_cb_list);
-  xbt_dynar_free(&sg_platf_trace_connect_cb_list);
 
   xbt_dynar_free(&sg_platf_ASroute_cb_list);
   xbt_dynar_free(&sg_platf_bypassRoute_cb_list);
@@ -332,13 +329,6 @@ void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) {
     fun(trace);
   }
 }
-void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect) {
-  unsigned int iterator;
-  sg_platf_trace_connect_cb_t fun;
-  xbt_dynar_foreach(sg_platf_trace_connect_cb_list, iterator, fun) {
-    fun(trace_connect);
-  }
-}
 
 void sg_platf_new_process(sg_platf_process_cbarg_t process)
 {
@@ -524,9 +514,6 @@ void sg_platf_bypassASroute_add_cb(sg_platf_route_cb_t fct) {
 void sg_platf_trace_add_cb(sg_platf_trace_cb_t fct) {
   xbt_dynar_push(sg_platf_trace_cb_list, &fct);
 }
-void sg_platf_trace_connect_add_cb(sg_platf_trace_connect_cb_t fct) {
-  xbt_dynar_push(sg_platf_trace_connect_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 9e7f208256..c017ff4c9f 100644
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -243,7 +243,7 @@ static void routing_parse_trace(sg_platf_trace_cbarg_t trace)
   xbt_dict_set(traces_set_list, trace->id, (void *) tmgr_trace, NULL);
 }
 
-static void routing_parse_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
+void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
 {
   xbt_assert(xbt_dict_get_or_null
               (traces_set_list, trace_connect->trace),
@@ -1248,7 +1248,6 @@ void routing_register_callbacks()
   sg_platf_postparse_add_cb(check_disk_attachment);
 
   sg_platf_trace_add_cb(routing_parse_trace);
-  sg_platf_trace_connect_add_cb(routing_parse_trace_connect);
 
   instr_routing_define_callbacks();
 }
-- 
2.20.1