X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9cb5e3d70f7208a4903b08fe41bee83df55ec2d2..98034d675561423c984b776fb176a430c6ed3c32:/include/surf/surfxml_parse.h

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 8d19128c52..779104129a 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -11,28 +11,27 @@
 #include <stdio.h> /* to have FILE */
 #include "surf/surfxml.h"
 #include "xbt/function_types.h"
-/* Entry-point of the surfxml parser. */
-XBT_PUBLIC_DATA(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. */
-
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_platform_description_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_platform_description_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_cpu_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_cpu_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_router_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_router_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_network_link_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_network_link_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_route_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_route_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_route_element_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_route_element_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_process_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_process_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) STag_surfxml_argument_fun;
-XBT_PUBLIC_DATA(void_f_void_t *) ETag_surfxml_argument_fun;
+#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_host_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_host_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_router_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_router_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_link_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_link_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_route_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_route_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_link_c_ctn_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_link_c_ctn_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_process_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_process_cb_list;
+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(void) surf_parse_open(const char *file);
 XBT_PUBLIC(void) surf_parse_close(void);
@@ -53,4 +52,23 @@ 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. */
+
+/* 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 { \
+  AX_surfxml_##key=AX_ptr; \
+  strcpy(A_surfxml_##key,val); \
+  AX_ptr+=strlen(val)+1; } while(0)
+
+#define SURFXML_BUFFER_RESET() do { \
+  AX_ptr = 0; \
+  memset(surfxml_bufferstack,0,surfxml_bufferstack_size); } while(0)
+
+#define SURFXML_START_TAG(tag)  STag_surfxml_##tag()
+#define SURFXML_END_TAG(tag)  do { ETag_surfxml_##tag(); SURFXML_BUFFER_RESET(); } while(0)     
+
+
+
 #endif