Use signals for platform callbacks

diff --git a/include/xbt/signal.hpp b/include/xbt/signal.hpp
index 2068546..de3c031 100644 (file)
--- a/include/xbt/signal.hpp
+++ b/include/xbt/signal.hpp
@@ -8,9 +8,15 @@
 
 #ifdef SIMGRID_HAVE_LIBSIG
 #include <sigc++/sigc++.h>
 
 #ifdef SIMGRID_HAVE_LIBSIG
 #include <sigc++/sigc++.h>

+#else
+#include <boost/signals2.hpp>
+#endif

 
 namespace simgrid {
 namespace xbt {
 
 namespace simgrid {
 namespace xbt {

+
+#ifdef SIMGRID_HAVE_LIBSIG
+

   // Wraps sigc++ signals with the interface of boost::signals2:
   template<class T> class signal;
   template<class R, class... P>
   // Wraps sigc++ signals with the interface of boost::signals2:
   template<class T> class signal;
   template<class R, class... P>


@@ -33,20 +39,20 @@ namespace xbt {
     {
       return sig_.emit(std::forward<Args>(args)...);
     }
     {
       return sig_.emit(std::forward<Args>(args)...);
     }

+    void disconnect_all_slots()
+    {
+      sig_.clear();
+    }

   };
   };

-}
-}

 
 #else
 
 
 #else
 

-#include <boost/signals2.hpp>
-namespace simgrid {
-namespace xbt {

   template<class T>
   using signal = ::boost::signals2::signal<T>;
   template<class T>
   using signal = ::boost::signals2::signal<T>;

-}
-}

 
 #endif
 
 
 #endif
 

-#endif
+}
+}
+
+#endif
\ No newline at end of file

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index a42a5d2..f1079cc 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -9,6 +9,7 @@
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "xbt/RngStream.h"
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "xbt/RngStream.h"

+#include <xbt/signal.hpp>

 #include "simgrid/platf_interface.h"
 #include "surf/surf_routing.h"
 #include "surf/surf.h"
 #include "simgrid/platf_interface.h"
 #include "surf/surf_routing.h"
 #include "surf/surf.h"


@@ -19,9 +20,9 @@
 #include "host_interface.hpp"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 #include "host_interface.hpp"
 
 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_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t
-xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t
+static simgrid::xbt::signal<void(sg_platf_link_cbarg_t)> on_link;
+static simgrid::xbt::signal<void(sg_platf_cluster_cbarg_t)> on_cluster;
+static simgrid::xbt::signal<void(void)> on_postparse;

 
 static int surf_parse_models_setup_already_called = 0;
 
 
 static int surf_parse_models_setup_already_called = 0;
 


@@ -30,21 +31,13 @@ static RngStream sg_platf_rng_stream = NULL;
 
 /** Module management function: creates all internal data structures */
 void sg_platf_init(void) {
 
 /** Module management function: creates all internal data structures */
 void sg_platf_init(void) {

-
-  //FIXME : Ugly, but useful...
-  if (sg_platf_postparse_cb_list)
-    return; //Already initialized, so do nothing...
-
-  sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL);
-  sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL);
-  sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL);

 }
 
 /** Module management function: frees all internal data structures */
 void sg_platf_exit(void) {
 }
 
 /** Module management function: frees all internal data structures */
 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_cluster_cb_list);
+  on_link.disconnect_all_slots();
+  on_cluster.disconnect_all_slots();
+  on_postparse.disconnect_all_slots();

 
   /* make sure that we will reinit the models while loading the platf once reinited */
   surf_parse_models_setup_already_called = 0;
 
   /* make sure that we will reinit the models while loading the platf once reinited */
   surf_parse_models_setup_already_called = 0;


@@ -121,22 +114,13 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
 }
 
 void sg_platf_new_link(sg_platf_link_cbarg_t link){
 }
 
 void sg_platf_new_link(sg_platf_link_cbarg_t link){

-  unsigned int iterator;
-  sg_platf_link_cb_t fun;
-  xbt_dynar_foreach(sg_platf_link_cb_list, iterator, fun) {
-    fun(link);
-  }
+  on_link(link);

 }
 
 void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
 {
   routing_new_cluster(cluster);
 }
 
 void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster)
 {
   routing_new_cluster(cluster);

-
-  unsigned int iterator;
-  sg_platf_cluster_cb_t fun;
-  xbt_dynar_foreach(sg_platf_cluster_cb_list, iterator, fun) {
-    fun(cluster);
-  }
+  on_cluster(cluster);

 }
 
 void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)
 }
 
 void sg_platf_new_storage(sg_platf_storage_cbarg_t storage)


@@ -376,11 +360,7 @@ void sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_cbarg_t ASro
 void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
 
 void sg_platf_end() {
 void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
 
 void sg_platf_end() {

-  unsigned int iterator;
-  void_f_void_t fun;
-  xbt_dynar_foreach(sg_platf_postparse_cb_list, iterator, fun) {
-    fun();
-  }
+  on_postparse();

 }
 
 void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)
 }
 
 void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS)


@@ -421,13 +401,13 @@ void sg_platf_new_AS_end()
 /* ***************************************** */
 
 void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
 /* ***************************************** */
 
 void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {

-  xbt_dynar_push(sg_platf_link_cb_list, &fct);
+  on_link.connect(fct);

 }
 void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) {
 }
 void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) {

-  xbt_dynar_push(sg_platf_cluster_cb_list, &fct);
+  on_cluster.connect(fct);

 }
 void sg_platf_postparse_add_cb(void_f_void_t fct) {
 }
 void sg_platf_postparse_add_cb(void_f_void_t fct) {

-  xbt_dynar_push(sg_platf_postparse_cb_list, &fct);
+  on_postparse.connect(fct);

 }
 
 void sg_platf_rng_stream_init(unsigned long seed[6]) {
 }
 
 void sg_platf_rng_stream_init(unsigned long seed[6]) {