X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8b9d5b06f13415e8201d2bff377190232121ab42..8fb370cb7b0fe8f6edcec683a27ffe6e58cb3056:/src/surf/sg_platf.c

diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c
index 175ff66f6f..e9eaa191fb 100644
--- a/src/surf/sg_platf.c
+++ b/src/surf/sg_platf.c
@@ -15,7 +15,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
 xbt_dynar_t sg_platf_host_cb_list = NULL;   // of sg_platf_host_cb_t
 xbt_dynar_t sg_platf_host_link_cb_list = NULL;   // of sg_platf_host_link_cb_t
 xbt_dynar_t sg_platf_link_cb_list = NULL;   // of sg_platf_link_cb_t
-xbt_dynar_t sg_platf_linkctn_cb_list = NULL;   // of sg_platf_linkctn_cb_t
 xbt_dynar_t sg_platf_router_cb_list = NULL; // of sg_platf_router_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
@@ -23,17 +22,23 @@ xbt_dynar_t sg_platf_cabinet_cb_list = NULL; // of sg_platf_cluster_cb_t
 xbt_dynar_t sg_platf_AS_begin_cb_list = NULL; //of sg_platf_AS_begin_cb_t
 xbt_dynar_t sg_platf_AS_end_cb_list = NULL; //of void_f_void_t
 xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t
+xbt_dynar_t sg_platf_prop_cb_list = NULL; // of sg_platf_prop_cb_t
 
 xbt_dynar_t sg_platf_route_cb_list = NULL; // of sg_platf_route_cb_t
 xbt_dynar_t sg_platf_ASroute_cb_list = NULL; // of sg_platf_ASroute_cb_t
 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;
+
 xbt_dynar_t sg_platf_storage_cb_list = NULL; // of sg_platf_storage_cb_t
 xbt_dynar_t sg_platf_storage_type_cb_list = NULL; // of sg_platf_storage_cb_t
 xbt_dynar_t sg_platf_mstorage_cb_list = NULL; // of sg_platf_storage_cb_t
 xbt_dynar_t sg_platf_mount_cb_list = NULL; // of sg_platf_storage_cb_t
 
+xbt_dynar_t sg_platf_process_cb_list = NULL;
+
 static int surf_parse_models_setup_already_called;
 
 /* one RngStream for the platform, to respect some statistic rules */
@@ -50,23 +55,28 @@ void sg_platf_init(void) {
   sg_platf_host_link_cb_list = xbt_dynar_new(sizeof(sg_platf_host_link_cb_t), NULL);
   sg_platf_router_cb_list = xbt_dynar_new(sizeof(sg_platf_router_cb_t), NULL);
   sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL);
-  sg_platf_linkctn_cb_list = xbt_dynar_new(sizeof(sg_platf_linkctn_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);
   sg_platf_AS_begin_cb_list = xbt_dynar_new(sizeof(sg_platf_AS_begin_cb_t),NULL);
   sg_platf_AS_end_cb_list = xbt_dynar_new(sizeof(void_f_void_t),NULL);
+  sg_platf_prop_cb_list = xbt_dynar_new(sizeof(sg_platf_prop_cb_t),NULL);
 
   sg_platf_route_cb_list = xbt_dynar_new(sizeof(sg_platf_route_cb_t), NULL);
   sg_platf_ASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_ASroute_cb_t), NULL);
   sg_platf_bypassRoute_cb_list = xbt_dynar_new(sizeof(sg_platf_bypassRoute_cb_t), NULL);
   sg_platf_bypassASroute_cb_list = xbt_dynar_new(sizeof(sg_platf_bypassASroute_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);
+
   sg_platf_storage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
   sg_platf_storage_type_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
   sg_platf_mstorage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
   sg_platf_mount_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
+
+  sg_platf_process_cb_list = xbt_dynar_new(sizeof(sg_platf_process_cb_t), NULL);
 }
 /** Module management function: frees all internal data structures */
 void sg_platf_exit(void) {
@@ -74,13 +84,16 @@ void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_host_link_cb_list);
   xbt_dynar_free(&sg_platf_router_cb_list);
   xbt_dynar_free(&sg_platf_link_cb_list);
-  xbt_dynar_free(&sg_platf_linkctn_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_AS_begin_cb_list);
   xbt_dynar_free(&sg_platf_AS_end_cb_list);
+  xbt_dynar_free(&sg_platf_prop_cb_list);
+
+  xbt_dynar_free(&sg_platf_trace_cb_list);
+  xbt_dynar_free(&sg_platf_trace_connect_cb_list);
 
   xbt_dynar_free(&sg_platf_route_cb_list);
   xbt_dynar_free(&sg_platf_ASroute_cb_list);
@@ -92,6 +105,8 @@ void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_mstorage_cb_list);
   xbt_dynar_free(&sg_platf_mount_cb_list);
 
+  xbt_dynar_free(&sg_platf_process_cb_list);
+
   /* make sure that we will reinit the models while loading the platf once reinited */
   surf_parse_models_setup_already_called = 0;
 }
@@ -125,13 +140,6 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){
   }
 }
 
-void sg_platf_new_linkctn(sg_platf_linkctn_cbarg_t linkctn){
-  unsigned int iterator;
-  sg_platf_linkctn_cb_t fun;
-  xbt_dynar_foreach(sg_platf_linkctn_cb_list, iterator, fun) {
-    fun(linkctn);
-  }
-}
 void sg_platf_new_peer(sg_platf_peer_cbarg_t peer){
   unsigned int iterator;
   sg_platf_peer_cb_t fun;
@@ -207,6 +215,35 @@ void sg_platf_new_bypassRoute(sg_platf_bypassRoute_cbarg_t bypassRoute) {
     fun(bypassASroute);
   }
 }
+void sg_platf_new_prop(sg_platf_prop_cbarg_t prop) {
+  unsigned int iterator;
+  sg_platf_prop_cb_t fun;
+  xbt_dynar_foreach(sg_platf_prop_cb_list, iterator, fun) {
+    fun(prop);
+  }
+}
+void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) {
+  unsigned int iterator;
+  sg_platf_trace_cb_t fun;
+  xbt_dynar_foreach(sg_platf_trace_cb_list, iterator, fun) {
+    fun(trace);
+  }
+}
+void sg_platf_new_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){
+  unsigned int iterator;
+  sg_platf_process_cb_t fun;
+  xbt_dynar_foreach(sg_platf_process_cb_list, iterator, fun) {
+    fun(process);
+  }
+}
+
 void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ }
 
 void sg_platf_end() {
@@ -263,9 +300,6 @@ void sg_platf_host_link_add_cb(sg_platf_host_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);
 }
-void sg_platf_linkctn_add_cb(sg_platf_linkctn_cb_t fct) {
-  xbt_dynar_push(sg_platf_linkctn_cb_list, &fct);
-}
 void sg_platf_router_add_cb(sg_platf_router_cb_t fct) {
   xbt_dynar_push(sg_platf_router_cb_list, &fct);
 }
@@ -311,11 +345,22 @@ void sg_platf_bypassRoute_add_cb(sg_platf_bypassRoute_cb_t fct) {
 void sg_platf_bypassASroute_add_cb(sg_platf_bypassASroute_cb_t fct) {
   xbt_dynar_push(sg_platf_bypassASroute_cb_list, &fct);
 }
-
+void sg_platf_prop_add_cb(sg_platf_prop_cb_t fct) {
+  xbt_dynar_push(sg_platf_prop_cb_list, &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);
 }
+void sg_platf_process_add_cb(sg_platf_process_cb_t fct) {
+  xbt_dynar_push(sg_platf_process_cb_list, &fct);
+}
 
 RngStream sg_platf_rng_stream_get(const char* id) {
   RngStream stream = NULL;