Kill the XML-level callbacks to AS_open/close and create some at sg_platf level instead

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

diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c
index c111a40..4d526ee 100644 (file)
--- a/src/surf/sg_platf.c
+++ b/src/surf/sg_platf.c
@@ -14,6 +14,9 @@ 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_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_ASopen_cb_list = NULL; //of sg_platf_ASopen_cb_t
+xbt_dynar_t sg_platf_ASclose_cb_list = NULL; //of void_f_void_t
 xbt_dynar_t sg_platf_postparse_cb_list = NULL; // of void_f_void_t
 
 /** Module management function: creates all internal data structures */
@@ -21,13 +24,19 @@ void sg_platf_init(void) {
   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_peer_cb_list = xbt_dynar_new(sizeof(sg_platf_peer_cb_t), NULL);
   sg_platf_postparse_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t),NULL);
+  sg_platf_ASopen_cb_list = xbt_dynar_new(sizeof(sg_platf_ASopen_cb_t),NULL);
+  sg_platf_ASclose_cb_list = xbt_dynar_new(sizeof(void_f_void_t),NULL);
 }
 /** 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_router_cb_list);
   xbt_dynar_free(&sg_platf_postparse_cb_list);
+  xbt_dynar_free(&sg_platf_peer_cb_list);
+  xbt_dynar_free(&sg_platf_ASopen_cb_list);
+  xbt_dynar_free(&sg_platf_ASclose_cb_list);
 }
 
 void sg_platf_new_host(sg_platf_host_cbarg_t h){
@@ -51,6 +60,13 @@ void sg_platf_new_link(sg_platf_link_cbarg_t 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);
+  }
+}
 
 void sg_platf_open() { /* Do nothing: just for symmetry of user code */ }
 
@@ -62,6 +78,22 @@ void sg_platf_close() {
   }
 }
 
+void sg_platf_new_AS_open(const char *id, const char *routing) {
+  unsigned int iterator;
+  sg_platf_ASopen_cb_t fun;
+  xbt_dynar_foreach(sg_platf_ASopen_cb_list, iterator, fun) {
+    (*fun) (id,routing);
+  }
+}
+
+void sg_platf_new_AS_close() {
+  unsigned int iterator;
+  void_f_void_t fun;
+  xbt_dynar_foreach(sg_platf_ASclose_cb_list, iterator, fun) {
+    (*fun) ();
+  }
+}
+
 
 void sg_platf_host_add_cb(sg_platf_host_cb_t fct) {
   xbt_dynar_push(sg_platf_host_cb_list, &fct);
@@ -72,7 +104,16 @@ void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
 void sg_platf_router_add_cb(sg_platf_router_cb_t fct) {
   xbt_dynar_push(sg_platf_router_cb_list, &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_postparse_add_cb(void_f_void_t fct) {
   xbt_dynar_push(sg_platf_postparse_cb_list, &fct);
 }
+void sg_platf_ASopen_add_cb(sg_platf_ASopen_cb_t fct) {
+  xbt_dynar_push(sg_platf_ASopen_cb_list, &fct);
+}
+void sg_platf_ASclose_add_cb(void_f_void_t fct) {
+  xbt_dynar_push(sg_platf_ASclose_cb_list, &fct);
+}