X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7b463c9c17665403d001fc59cb649551e93d950..2c5c14ffd2b2af540f201434bd4d32f9c197507f:/src/surf/sg_platf.c

diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c
index 65cc84c7e8..874a00004d 100644
--- a/src/surf/sg_platf.c
+++ b/src/surf/sg_platf.c
@@ -13,10 +13,12 @@
 
 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_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
+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
@@ -34,10 +36,12 @@ static RngStream sg_platf_rng_stream = NULL;
 /** Module management function: creates all internal data structures */
 void sg_platf_init(void) {
   sg_platf_host_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL);
+  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_host_cb_t), NULL);
   sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_host_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);
@@ -50,11 +54,13 @@ void sg_platf_init(void) {
 /** Module management function: frees all internal data structures */
 void sg_platf_exit(void) {
   xbt_dynar_free(&sg_platf_host_cb_list);
+  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_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);
 
@@ -74,6 +80,13 @@ void sg_platf_new_host(sg_platf_host_cbarg_t h){
     fun(h);
   }
 }
+void sg_platf_new_host_link(sg_platf_host_link_cbarg_t h){
+  unsigned int iterator;
+  sg_platf_host_link_cb_t fun;
+  xbt_dynar_foreach(sg_platf_host_link_cb_list, iterator, fun) {
+    fun(h);
+  }
+}
 void sg_platf_new_router(sg_platf_router_cbarg_t router) {
   unsigned int iterator;
   sg_platf_router_cb_t fun;
@@ -102,6 +115,13 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){
     fun(cluster);
   }
 }
+void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet){
+  unsigned int iterator;
+  sg_platf_cabinet_cb_t fun;
+  xbt_dynar_foreach(sg_platf_cabinet_cb_list, iterator, fun) {
+    fun(cabinet);
+  }
+}
 void sg_platf_new_storage(sg_platf_storage_cbarg_t storage){
   unsigned int iterator;
   sg_platf_storage_cb_t fun;
@@ -143,7 +163,7 @@ void sg_platf_end() {
 
 static int surf_parse_models_setup_already_called = 0;
 
-void sg_platf_new_AS_begin(const char *id, const char *routing) {
+void sg_platf_new_AS_begin(const char *id, int routing) {
   unsigned int iterator;
   sg_platf_AS_begin_cb_t fun;
 
@@ -181,6 +201,9 @@ void sg_platf_new_AS_end() {
 void sg_platf_host_add_cb(sg_platf_host_cb_t fct) {
   xbt_dynar_push(sg_platf_host_cb_list, &fct);
 }
+void sg_platf_host_link_add_cb(sg_platf_host_link_cb_t fct) {
+  xbt_dynar_push(sg_platf_host_link_cb_list, &fct);
+}
 void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
   xbt_dynar_push(sg_platf_link_cb_list, &fct);
 }
@@ -193,6 +216,9 @@ void sg_platf_peer_add_cb(sg_platf_peer_cb_t fct) {
 void sg_platf_cluster_add_cb(sg_platf_cluster_cb_t fct) {
   xbt_dynar_push(sg_platf_cluster_cb_list, &fct);
 }
+void sg_platf_cabinet_add_cb(sg_platf_cabinet_cb_t fct) {
+  xbt_dynar_push(sg_platf_cabinet_cb_list, &fct);
+}
 void sg_platf_postparse_add_cb(void_f_void_t fct) {
   xbt_dynar_push(sg_platf_postparse_cb_list, &fct);
 }
@@ -224,10 +250,10 @@ void sg_platf_rng_stream_init(unsigned long seed[6]) {
 RngStream sg_platf_rng_stream_get(const char* id) {
   RngStream stream = NULL;
   unsigned int id_hash;
-  
+
   stream = RngStream_CopyStream(sg_platf_rng_stream);
   id_hash = xbt_str_hash(id);
   RngStream_AdvanceState(stream, 0, (long)id_hash);
-  
+
   return stream;
 }