-/* Entry-point of the surfxml parser. */
-extern 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 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_get_double(double *value,const char *string);
+#include "xbt/dict.h"
+
+SG_BEGIN_DECL()
+
+/* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */
+ XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_platform_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_platform_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_host_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_host_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_router_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_router_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_link_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_link_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_route_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_route_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_link_ctn_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_link_ctn_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_process_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_process_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_argument_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_argument_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_prop_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_prop_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_trace_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_trace_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_trace_connect_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_trace_connect_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_random_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_random_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_AS_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_AS_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_ASroute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_ASroute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_bypassRoute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_bypassRoute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_cluster_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_cluster_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_peer_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_peer_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_config_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_config_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);