X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fc1551b7a3cbbcdb9fb48500f70683318c87c47b..1d558deeec797460abbfa5ed52f1e7ae784dcf7e:/src/surf/sg_platf.c

diff --git a/src/surf/sg_platf.c b/src/surf/sg_platf.c
index f47d406953..4d526eec04 100644
--- a/src/surf/sg_platf.c
+++ b/src/surf/sg_platf.c
@@ -9,27 +9,111 @@
 #include "xbt/str.h"
 #include "xbt/dict.h"
 #include "simgrid/platf_interface.h"
-#include "surf/surf_private.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
-xbt_dynar_t surf_parse_host_cb_list = NULL; // of functions of type: surf_parsing_host_arg_t -> void
+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 */
 void sg_platf_init(void) {
-  surf_parse_host_cb_list = xbt_dynar_new(sizeof(surf_parse_host_fct_t), NULL);
+  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(&surf_parse_host_cb_list);
+  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(surf_parsing_host_arg_t h){
+void sg_platf_new_host(sg_platf_host_cbarg_t h){
   unsigned int iterator;
-  surf_parse_host_fct_t fun;
-  xbt_dynar_foreach(surf_parse_host_cb_list, iterator, fun) {
-    if (fun) (*fun) (h);
+  sg_platf_host_cb_t fun;
+  xbt_dynar_foreach(sg_platf_host_cb_list, iterator, fun) {
+    (*fun) (h);
   }
 }
-void surf_parse_host_add_cb(surf_parse_host_fct_t fct) {
-  xbt_dynar_push(surf_parse_host_cb_list, &fct);
+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);
+  }
+}
+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);
+  }
+}
+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 */ }
+
+void sg_platf_close() {
+  unsigned int iterator;
+  void_f_void_t fun;
+  xbt_dynar_foreach(sg_platf_postparse_cb_list, iterator, fun) {
+    (*fun) ();
+  }
+}
+
+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);
+}
+void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
+  xbt_dynar_push(sg_platf_link_cb_list, &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);
+}
+