X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad5365a072943b2b0bacc486fa504e93a99ea940..5d9f27f6396cd1a4dddacc2a743ad697b9e342b9:/include/surf/surfxml_parse.h

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 5b5bb25483..342d25cd9b 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -8,29 +8,34 @@
 #ifndef _SURF_SURFXML_PARSE_H
 #define _SURF_SURFXML_PARSE_H
 
+#include <stdio.h> /* to have FILE */
 #include "surf/surfxml.h"
-#include "xbt/sysdep.h" /* to have FILE */
 #include "xbt/function_types.h"
+#include "xbt/dict.h"
+
 /* Entry-point of the surfxml parser. */
-extern int_f_void_t *surf_parse;
+XBT_PUBLIC_DATA(int_f_void_t) surf_parse;
 
 /* Hook for the different tags. They can be redefined at will whereas
    the versions without the _fun can't. */
-
-extern void_f_void_t *STag_surfxml_platform_description_fun;
-extern void_f_void_t *ETag_surfxml_platform_description_fun;
-extern void_f_void_t *STag_surfxml_cpu_fun;
-extern void_f_void_t *ETag_surfxml_cpu_fun;
-extern void_f_void_t *STag_surfxml_network_link_fun;
-extern void_f_void_t *ETag_surfxml_network_link_fun;
-extern void_f_void_t *STag_surfxml_route_fun;
-extern void_f_void_t *ETag_surfxml_route_fun;
-extern void_f_void_t *STag_surfxml_route_element_fun;
-extern void_f_void_t *ETag_surfxml_route_element_fun;
-extern void_f_void_t *STag_surfxml_process_fun;
-extern void_f_void_t *ETag_surfxml_process_fun;
-extern void_f_void_t *STag_surfxml_argument_fun;
-extern void_f_void_t *ETag_surfxml_argument_fun;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_platform_description_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_platform_description_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_host_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_host_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_router_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_router_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_link_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_link_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_route_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_route_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_link_c_ctn_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_link_c_ctn_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_process_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_process_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_argument_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_argument_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_prop_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_prop_cb_list;
 
 XBT_PUBLIC(void) surf_parse_open(const char *file);
 XBT_PUBLIC(void) surf_parse_close(void);
@@ -40,10 +45,10 @@ XBT_PUBLIC(void) surf_parse_get_double(double *value,const char *string);
 /* Prototypes of the functions offered by flex */
 XBT_PUBLIC(int) surf_parse_lex(void);
 XBT_PUBLIC(int) surf_parse_get_lineno(void);
-XBT_PUBLIC(FILE) *surf_parse_get_in(void);
-XBT_PUBLIC(FILE) *surf_parse_get_out(void);
+XBT_PUBLIC(FILE*) surf_parse_get_in(void);
+XBT_PUBLIC(FILE*) surf_parse_get_out(void);
 XBT_PUBLIC(int) surf_parse_get_leng(void);
-XBT_PUBLIC(char) *surf_parse_get_text(void);
+XBT_PUBLIC(char*) surf_parse_get_text(void);
 XBT_PUBLIC(void) surf_parse_set_lineno(int line_number);
 XBT_PUBLIC(void) surf_parse_set_in(FILE * in_str);
 XBT_PUBLIC(void) surf_parse_set_out(FILE * out_str);