clean code and remove foreach and set

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

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 7ff7bfe..46585fe 100644 (file)
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -16,7 +16,7 @@
 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) 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;
@@ -34,20 +34,18 @@ 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_set_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_set_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_foreach_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_foreach_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_route_c_multi_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_route_c_multi_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_trace_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_trace_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_trace_c_connect_cb_list;
 XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_trace_c_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(void) surf_parse_open(const char *file);
 XBT_PUBLIC(void) surf_parse_close(void);
@@ -70,9 +68,6 @@ XBT_PUBLIC(int) surf_parse_get_debug(void);
 XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
 XBT_PUBLIC(int) surf_parse_lex_destroy(void);
 
-/* init host and bypass the parser*/
-XBT_PUBLIC(void) init_host_bypass(char* name,double power);
-
 /* What is needed to bypass the parser. */
 XBT_PUBLIC_DATA(int_f_void_t) surf_parse;       /* Entry-point to the parser. Set this to your function. */
 
@@ -90,9 +85,8 @@ XBT_PUBLIC_DATA(int_f_void_t) surf_parse;       /* Entry-point to the parser. Se
 #define SURFXML_START_TAG(tag)  STag_surfxml_##tag()
 #define SURFXML_END_TAG(tag)  do { ETag_surfxml_##tag(); SURFXML_BUFFER_RESET(); } while(0)
 
-XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list,
-                                      void_f_void_t function);
-
+XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function);
+XBT_PUBLIC(void) surfxml_del_callback(xbt_dynar_t* cb_list, void_f_void_t function);
 
 SG_END_DECL()
 #endif