X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad5365a072943b2b0bacc486fa504e93a99ea940..8dcab2e3c296d3bf6ec701ccba85b45856c67e7e:/include/surf/surfxml_parse.h?ds=sidebyside

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 5b5bb25483..562201c0d3 100644
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -1,6 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2005 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -8,47 +7,72 @@
 #ifndef _SURF_SURFXML_PARSE_H
 #define _SURF_SURFXML_PARSE_H
 
-#include "surf/surfxml.h"
-#include "xbt/sysdep.h" /* to have FILE */
+#include <stdio.h>              /* to have FILE */
+#include "surf/simgrid_dtd.h"
 #include "xbt/function_types.h"
-/* Entry-point of the surfxml parser. */
-extern 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. */
-
-extern void_f_void_t *STag_surfxml_platform_description_fun;
-extern void_f_void_t *ETag_surfxml_platform_description_fun;
-extern void_f_void_t *STag_surfxml_cpu_fun;
-extern void_f_void_t *ETag_surfxml_cpu_fun;
-extern void_f_void_t *STag_surfxml_network_link_fun;
-extern void_f_void_t *ETag_surfxml_network_link_fun;
-extern void_f_void_t *STag_surfxml_route_fun;
-extern void_f_void_t *ETag_surfxml_route_fun;
-extern void_f_void_t *STag_surfxml_route_element_fun;
-extern void_f_void_t *ETag_surfxml_route_element_fun;
-extern void_f_void_t *STag_surfxml_process_fun;
-extern void_f_void_t *ETag_surfxml_process_fun;
-extern void_f_void_t *STag_surfxml_argument_fun;
-extern void_f_void_t *ETag_surfxml_argument_fun;
+#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 */
+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_c_ctn_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_link_c_ctn_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) STag_surfxml_process_cb_list;
+XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_process_cb_list;
+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_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);
 XBT_PUBLIC(void) surf_parse_reset_parser(void);
-XBT_PUBLIC(void) surf_parse_get_double(double *value,const char *string);
+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);
 
 /* Prototypes of the functions offered by flex */
-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(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(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(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);
+
+/* 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. */
+
+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