X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/79f2c630c9587d494cb154e6d074294c1e23208e..e058e06362ce27135c41d3657840f9fd78667687:/src/surf/sg_platf.cpp

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 9cc96bdfd0..f1079cc1dc 100644
--- 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/signal.hpp>
 #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);
-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;
 
@@ -30,21 +31,13 @@ static RngStream sg_platf_rng_stream = NULL;
 
 /** 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;
@@ -60,7 +53,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
   if (current_routing)
     net = routing_add_host(current_routing, host);
 
-  sg_host_t h = simgrid::Host::by_name_or_create(host->id);
+  sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id);
   simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu(
 		h,
         host->speed_peak,
@@ -71,6 +64,8 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host)
         host->initiallyOn,
         host->state_trace);
   surf_host_model->createHost(host->id, net, cpu, host->properties)->attach(h);
+  simgrid::s4u::Host::onCreation(*h);
+
   if (TRACE_is_enabled() && TRACE_needs_platform())
     sg_instr_new_host(host);
 }
@@ -93,7 +88,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router)
   info->setId(current_routing->parsePU(info));
   xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info);
   XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId());
-  simgrid::surf::routingEdgeCreatedCallbacks(info);
+  simgrid::surf::netcardCreatedCallbacks(info);
 
   if (router->coord && strcmp(router->coord, "")) {
     unsigned int cursor;
@@ -119,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){
-  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)
@@ -374,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() {
-  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)
@@ -419,13 +401,13 @@ void sg_platf_new_AS_end()
 /* ***************************************** */
 
 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]) {