merging branch 5018:5083 into trunk

[simgrid.git] / include / surf / surfxml_parse.h

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index a097de8..a8b5e5c 100644 (file)
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -14,8 +14,8 @@
 #include "xbt/dict.h"
 
 /* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */
-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_platform_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_platform_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;
@@ -32,12 +32,27 @@ 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(xbt_dynar_t) STag_surfxml_set_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_set_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_foreach_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_foreach_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_route_c_multi_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_route_c_multi_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_cluster_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_cluster_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_trace_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_trace_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_trace_c_connect_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_trace_c_connect_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_random_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_random_cb_list;
 
 XBT_PUBLIC(void) surf_parse_open(const char *file);
 XBT_PUBLIC(void) surf_parse_close(void);
 XBT_PUBLIC(void) surf_parse_reset_parser(void);
 XBT_PUBLIC(void) surf_parse_free_callbacks(void);
 XBT_PUBLIC(void) surf_parse_get_double(double *value,const char *string);
+XBT_PUBLIC(void) surf_parse_get_int(int *value,const char *string);
 
 /* Prototypes of the functions offered by flex */
 XBT_PUBLIC(int) surf_parse_lex(void);