X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/607e033306049c7d3bdb768dd2b05c279d22e4b8..14dbe48f4f9623cf72fc207b7c2041b9f611972a:/include/surf/surfxml_parse.h diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h index ec660d964f..83957d15fa 100644 --- a/include/surf/surfxml_parse.h +++ b/include/surf/surfxml_parse.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2006-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,65 +8,38 @@ #define _SURF_SURFXML_PARSE_H #include /* to have FILE */ -#include "surf/simgrid_dtd.h" +#include "xbt/misc.h" #include "xbt/function_types.h" #include "xbt/dict.h" - SG_BEGIN_DECL() +#include "surf/simgrid_dtd.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_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_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_gateway_cb_list; // added by david -XBT_PUBLIC_DATA(xbt_dynar_t) ETag_surfxml_gateway_cb_list; // added by david - +#ifndef YY_TYPEDEF_YY_SIZE_T +#define YY_TYPEDEF_YY_SIZE_T +typedef size_t yy_size_t; +#endif 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) XBT_ATTRIB_NORETURN surf_parse_error(const char *msg,...) XBT_ATTRIB_PRINTF(1,2); +XBT_PUBLIC(void) surf_parse_warn(const char *msg,...) XBT_ATTRIB_PRINTF(1,2); +XBT_PUBLIC(double) surf_parse_get_double(const char *string); +XBT_PUBLIC(int) surf_parse_get_int(const char *string); +XBT_PUBLIC(double) surf_parse_get_time(const char *string, const char *entity_kind, const char *name); +XBT_PUBLIC(double) surf_parse_get_size(const char *string, const char *entity_kind, const char *name); +XBT_PUBLIC(double) surf_parse_get_bandwidth(const char *string, const char *entity_kind, const char *name); +XBT_PUBLIC(double) surf_parse_get_speed(const char *string, const char *entity_kind, const char *name); /* 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(yy_size_t) 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); @@ -80,6 +53,10 @@ XBT_PUBLIC_DATA(int_f_void_t) surf_parse; /* Entry-point to the parser. Se /* Set of macros to make the bypassing work easier. * See examples/msg/masterslave_bypass.c for an example of use */ + +extern unsigned int surfxml_buffer_stack_stack_ptr; +extern unsigned int surfxml_buffer_stack_stack[1024]; + #define SURFXML_BUFFER_SET(key,val) do { \ AX_surfxml_##key=AX_ptr; \ strcpy(A_surfxml_##key,val); \ @@ -89,11 +66,17 @@ XBT_PUBLIC_DATA(int_f_void_t) surf_parse; /* Entry-point to the parser. Se 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) +#define SURFXML_START_TAG(tag) \ + do{ \ + surfxml_buffer_stack_stack[surfxml_buffer_stack_stack_ptr++] = AX_ptr; \ + STag_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_END_TAG(tag) \ + do{ \ + AX_ptr = surfxml_buffer_stack_stack[--surfxml_buffer_stack_stack_ptr]; \ + ETag_surfxml_##tag(); \ + } while(0) SG_END_DECL() #endif