Use the function sg_platf_new_linkctn when parsing platform

[simgrid.git] / src / surf / sg_platf.c

diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c
index 077615c..e4480b1 100644 (file)
--- a/src/surf/sg_platf.c
+++ b/src/surf/sg_platf.c
@@ -13,10 +13,13 @@
 
 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
+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
@@ -33,11 +36,19 @@ 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_host_cb_list)
+    return; //Already initialized, so do nothing...
+
   sg_platf_host_cb_list = xbt_dynar_new(sizeof(sg_platf_host_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_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);
@@ -50,11 +61,14 @@ 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_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);
 
@@ -74,6 +88,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;
@@ -88,6 +109,14 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){
     fun(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;
@@ -102,6 +131,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;
@@ -181,9 +217,15 @@ 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);
 }
+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);
 }
@@ -193,6 +235,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);
 }