Add cluster tag

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

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index e05ad7d..5d1dba5 100644 (file)
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -34,24 +34,20 @@ 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; // added by david
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_AS_cb_list; // added by david
-XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_ASroute_cb_list; // added by david
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_ASroute_cb_list; // added by david
+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(void) surf_parse_open(const char *file);
 XBT_PUBLIC(void) surf_parse_close(void);
@@ -61,22 +57,24 @@ 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);
-XBT_PUBLIC(int) surf_parse_get_lineno(void);
+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(int) surf_parse_get_leng(void);
+XBT_PUBLIC(int)    surf_parse_get_leng(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);
-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);
+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);
+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);
 
 /* 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. */
 
+/*WHY DELETE THIS DAVID????*/
+
 /* Set of macros to make the bypassing work easier.
  * See examples/msg/masterslave_bypass.c for an example of use */
 #define SURFXML_BUFFER_SET(key,val) do { \
@@ -91,6 +89,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)
 
+/*WHY DELETE THIS DAVID????*/
+
 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);