#ifdef SIMGRID_HAVE_LIBSIG
#include <sigc++/sigc++.h>
+#else
+#include <boost/signals2.hpp>
+#endif
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>
{
return sig_.emit(std::forward<Args>(args)...);
}
+ void disconnect_all_slots()
+ {
+ sig_.clear();
+ }
};
-}
-}
#else
-#include <boost/signals2.hpp>
-namespace simgrid {
-namespace xbt {
template<class T>
using signal = ::boost::signals2::signal<T>;
-}
-}
#endif
-#endif
+}
+}
+
+#endif
\ No newline at end of file
#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 "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;
/** 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) {
- 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;
}
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);
-
- 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_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_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) {
- xbt_dynar_push(sg_platf_cluster_cb_list, &fct);
+ on_cluster.connect(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]) {