X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eeb7d85cca6fb1431e050d26e96f75aacfcec357..20801428bec07ed58c348d25ad39878f2c208389:/include/surf/surfxml_parse.h

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 3d48dca056..98c47d2d10 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -8,21 +8,14 @@
 #define _SURF_SURFXML_PARSE_H
 
 #include <stdio.h>              /* to have FILE */
-#include "surf/simgrid_dtd.h"
+#include "xbt/misc.h"
 #include "xbt/function_types.h"
 #include "xbt/dict.h"
+#include "surf/simgrid_dtd.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;
@@ -39,38 +32,41 @@ 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_config_cb_list;
-XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_config_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_bypassASroute_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_bypassASroute_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_include_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_include_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_storage_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_storage_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_init_callbacks(void);
+XBT_PUBLIC(void) surf_parse_reset_callbacks(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);
-
+XBT_PUBLIC(void) surf_parse_error(const char *msg,...) _XBT_GNUC_PRINTF(1,2) _XBT_GNUC_NORETURN;
+XBT_PUBLIC(void) surf_parse_warn(const char *msg,...) _XBT_GNUC_PRINTF(1,2);
+XBT_PUBLIC(double) surf_parse_get_double(const char *string);
+XBT_PUBLIC(int) surf_parse_get_int(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. */
@@ -90,20 +86,22 @@ extern unsigned int surfxml_buffer_stack_stack[1024];
   AX_ptr = 0; \
   memset(surfxml_bufferstack,0,surfxml_bufferstack_size); } while(0)
 
-#define SURFXML_START_TAG(tag) do{ \
-		surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr] = AX_ptr;\
-		surfxml_buffer_stack_stack_ptr++;\
-		STag_surfxml_##tag(); \
-		}while(0)
-
-#define SURFXML_END_TAG(tag)  do{ \
-		surfxml_buffer_stack_stack_ptr--;\
-		AX_ptr = surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr-1];\
-		ETag_surfxml_##tag();\
-		} while(0)
-
-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);
+#define SURFXML_START_TAG(tag) \
+  do{                                                                   \
+    surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr++] = AX_ptr; \
+    STag_surfxml_##tag();                                               \
+  }while(0)
+
+#define SURFXML_END_TAG(tag)                                            \
+  do{                                                                   \
+    AX_ptr = surfxml_buffer_stack_stack[--surfxml_buffer_stack_stack_ptr]; \
+    ETag_surfxml_##tag();                                               \
+  } while(0)
+
+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