Add model storage to surf and add a tag storage to dtd.

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

diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c
index e3264df..35d18ef 100644 (file)
--- a/src/surf/sg_platf.c
+++ b/src/surf/sg_platf.c
@@ -15,9 +15,11 @@ xbt_dynar_t sg_platf_host_cb_list = NULL;   // of sg_platf_host_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_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_storage_cb_list = NULL; // of sg_platf_storage_cb_t
 
 static int surf_parse_models_setup_already_called;
 
@@ -28,9 +30,11 @@ void sg_platf_init(void) {
   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_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_storage_cb_list = xbt_dynar_new(sizeof(sg_platf_storage_cb_t), NULL);
 }
 /** Module management function: frees all internal data structures */
 void sg_platf_exit(void) {
@@ -39,8 +43,10 @@ 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_peer_cb_list);
+  xbt_dynar_free(&sg_platf_cluster_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_storage_cb_list);
 
   /* make sure that we will reinit the models while loading the platf once reinited */
   surf_parse_models_setup_already_called = 0;
@@ -50,28 +56,42 @@ void sg_platf_new_host(sg_platf_host_cbarg_t h){
   unsigned int iterator;
   sg_platf_host_cb_t fun;
   xbt_dynar_foreach(sg_platf_host_cb_list, iterator, fun) {
-    (*fun) (h);
+    fun(h);
   }
 }
 void sg_platf_new_router(sg_platf_router_cbarg_t router) {
   unsigned int iterator;
   sg_platf_router_cb_t fun;
   xbt_dynar_foreach(sg_platf_router_cb_list, iterator, fun) {
-    (*fun) (router);
+    fun(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);
+    fun(link);
   }
 }
 void sg_platf_new_peer(sg_platf_peer_cbarg_t peer){
   unsigned int iterator;
   sg_platf_peer_cb_t fun;
-  xbt_dynar_foreach(sg_platf_link_cb_list, iterator, fun) {
-    (*fun) (peer);
+  xbt_dynar_foreach(sg_platf_peer_cb_list, iterator, fun) {
+    fun(peer);
+  }
+}
+void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster){
+  unsigned int iterator;
+  sg_platf_cluster_cb_t fun;
+  xbt_dynar_foreach(sg_platf_cluster_cb_list, iterator, fun) {
+    fun(cluster);
+  }
+}
+void sg_platf_new_storage(sg_platf_storage_cbarg_t storage){
+  unsigned int iterator;
+  sg_platf_storage_cb_t fun;
+  xbt_dynar_foreach(sg_platf_storage_cb_list, iterator, fun) {
+    fun(storage);
   }
 }
 
@@ -81,7 +101,7 @@ void sg_platf_end() {
   unsigned int iterator;
   void_f_void_t fun;
   xbt_dynar_foreach(sg_platf_postparse_cb_list, iterator, fun) {
-    (*fun) ();
+    fun();
   }
 }
 
@@ -91,7 +111,7 @@ void sg_platf_new_AS_begin(const char *id, const char *routing) {
   unsigned int iterator;
   sg_platf_AS_begin_cb_t fun;
 
-  if (!surf_parse_models_setup_already_called && xbt_dynar_length(sg_platf_AS_begin_cb_list)) {
+  if (!surf_parse_models_setup_already_called && !xbt_dynar_is_empty(sg_platf_AS_begin_cb_list)) {
     /* Initialize the surf models. That must be done after we got all config, and before we need the models.
      * That is, after the last <config> tag, if any, and before the first of cluster|peer|AS|trace|trace_connect
      *
@@ -109,7 +129,7 @@ void sg_platf_new_AS_begin(const char *id, const char *routing) {
   }
 
   xbt_dynar_foreach(sg_platf_AS_begin_cb_list, iterator, fun) {
-    (*fun) (id,routing);
+    fun(id, routing);
   }
 }
 
@@ -117,7 +137,7 @@ void sg_platf_new_AS_end() {
   unsigned int iterator;
   void_f_void_t fun;
   xbt_dynar_foreach(sg_platf_AS_end_cb_list, iterator, fun) {
-    (*fun) ();
+    fun();
   }
 }
 
@@ -134,6 +154,9 @@ void sg_platf_router_add_cb(sg_platf_router_cb_t fct) {
 void sg_platf_peer_add_cb(sg_platf_peer_cb_t fct) {
   xbt_dynar_push(sg_platf_peer_cb_list, &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_postparse_add_cb(void_f_void_t fct) {
   xbt_dynar_push(sg_platf_postparse_cb_list, &fct);
 }
@@ -143,4 +166,7 @@ void sg_platf_AS_begin_add_cb(sg_platf_AS_begin_cb_t fct) {
 void sg_platf_AS_end_add_cb(void_f_void_t fct) {
   xbt_dynar_push(sg_platf_AS_end_cb_list, &fct);
 }
+void sg_platf_storage_add_cb(sg_platf_storage_cb_t fct) {
+  xbt_dynar_push(sg_platf_storage_cb_list, &fct);
+}