Rewrite the SURFXML_START_TAG and SURFXML_END_TAG.

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

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 562201c..c66cdf7 100644 (file)
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -12,7 +12,6 @@
 #include "xbt/function_types.h"
 #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 */
@@ -46,6 +45,8 @@ 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);
@@ -68,9 +69,33 @@ 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+=(int)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) 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{ \
+                                                               AX_ptr = surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr-1];\
+                                                               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);