From dfc0da2aec8e099dc554b1321ff895f6151e0418 Mon Sep 17 00:00:00 2001 From: mquinson Date: Sun, 3 Feb 2008 10:54:13 +0000 Subject: [PATCH] kill properly the surfxml.h file since it got renamed to simgrid_dtd.h a while ago git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5242 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- include/Makefile.am | 2 +- include/Makefile.in | 2 +- include/surf/surfxml.h | 369 ----------------------------------- include/surf/surfxml_parse.h | 2 +- 4 files changed, 3 insertions(+), 372 deletions(-) delete mode 100644 include/surf/surfxml.h diff --git a/include/Makefile.am b/include/Makefile.am index 7ad075dd0e..0095c4c17e 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -41,7 +41,7 @@ nobase_include_HEADERS = \ smpi/smpi.h \ \ surf/surfxml_parse.h \ - surf/surfxml.h \ + surf/simgrid_dtd.h \ \ gras/datadesc.h gras/transport.h \ gras/virtu.h gras/emul.h gras/process.h gras/module.h \ diff --git a/include/Makefile.in b/include/Makefile.in index 996780b1fe..ac5c3bab9c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -249,7 +249,7 @@ nobase_include_HEADERS = \ smpi/smpi.h \ \ surf/surfxml_parse.h \ - surf/surfxml.h \ + surf/simgrid_dtd.h \ \ gras/datadesc.h gras/transport.h \ gras/virtu.h gras/emul.h gras/process.h gras/module.h \ diff --git a/include/surf/surfxml.h b/include/surf/surfxml.h deleted file mode 100644 index 36f41b6184..0000000000 --- a/include/surf/surfxml.h +++ /dev/null @@ -1,369 +0,0 @@ -/* XML processor/application API for surf/surfxml.dtd. - * Generated 2007/11/29 14:32:37. - * - * This program was generated with the FleXML XML processor generator. - * FleXML is Copyright (C) 1999-2005 Kristoffer Rose. All rights reserved. - * FleXML is Copyright (C) 2003-2006 Martin Quinson. All rights reserved. - * (Id: flexml.pl,v 1.61 2006/09/13 16:34:33 wdowling Exp). - * - * There are two, intertwined parts to this program, part A and part B. - * - * Part A - * ------ - * - * Some parts, here collectively called "Part A", are found in the - * FleXML package. They are Copyright (C) 1999-2005 Kristoffer Rose - * and Copyright (C) 2003-2006 Martin Quinson. All rights reserved. - * - * You can redistribute, use, perform, display and/or modify "Part A" - * provided the following two conditions hold: - * - * 1. The program is distributed WITHOUT ANY WARRANTY from the author of - * FleXML; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. - * - * 2. The program distribution conditions do not in any way affect the - * distribution conditions of the FleXML system used to generate this - * file or any version of FleXML derived from that system. - * - * Notice that these are explicit rights granted to you for files - * generated by the FleXML system. For your rights in connection with - * the FleXML system itself please consult the GNU General Public License. - * - * Part B - * ------ - * - * The other parts, here collectively called "Part B", and which came - * from the DTD used by FleXML to generate this program, can be - * distributed (or not, as the case may be) under the terms of whoever - * wrote them, provided these terms respect and obey the two conditions - * above under the heading "Part A". - * - * The author of and contributors to FleXML specifically disclaim - * any copyright interest in "Part B", unless "Part B" was written - * by the author of or contributors to FleXML. - * - */ - -#ifndef _FLEXML_surfxml_H -#define _FLEXML_surfxml_H - -/* XML application entry points. */ -XBT_PUBLIC(void ) STag_surfxml_platform(void); -XBT_PUBLIC(void ) ETag_surfxml_platform(void); -XBT_PUBLIC(void ) STag_surfxml_include(void); -XBT_PUBLIC(void ) ETag_surfxml_include(void); -XBT_PUBLIC(void ) STag_surfxml_trace(void); -XBT_PUBLIC(void ) ETag_surfxml_trace(void); -XBT_PUBLIC(void ) STag_surfxml_random(void); -XBT_PUBLIC(void ) ETag_surfxml_random(void); -XBT_PUBLIC(void ) STag_surfxml_trace_c_connect(void); -XBT_PUBLIC(void ) ETag_surfxml_trace_c_connect(void); -XBT_PUBLIC(void ) STag_surfxml_set(void); -XBT_PUBLIC(void ) ETag_surfxml_set(void); -XBT_PUBLIC(void ) STag_surfxml_foreach(void); -XBT_PUBLIC(void ) ETag_surfxml_foreach(void); -XBT_PUBLIC(void ) STag_surfxml_host(void); -XBT_PUBLIC(void ) ETag_surfxml_host(void); -XBT_PUBLIC(void ) STag_surfxml_prop(void); -XBT_PUBLIC(void ) ETag_surfxml_prop(void); -XBT_PUBLIC(void ) STag_surfxml_cluster(void); -XBT_PUBLIC(void ) ETag_surfxml_cluster(void); -XBT_PUBLIC(void ) STag_surfxml_router(void); -XBT_PUBLIC(void ) ETag_surfxml_router(void); -XBT_PUBLIC(void ) STag_surfxml_link(void); -XBT_PUBLIC(void ) ETag_surfxml_link(void); -XBT_PUBLIC(void ) STag_surfxml_route_c_multi(void); -XBT_PUBLIC(void ) ETag_surfxml_route_c_multi(void); -XBT_PUBLIC(void ) STag_surfxml_route(void); -XBT_PUBLIC(void ) ETag_surfxml_route(void); -XBT_PUBLIC(void ) STag_surfxml_link_c_ctn(void); -XBT_PUBLIC(void ) ETag_surfxml_link_c_ctn(void); -XBT_PUBLIC(void ) STag_surfxml_process(void); -XBT_PUBLIC(void ) ETag_surfxml_process(void); -XBT_PUBLIC(void ) STag_surfxml_argument(void); -XBT_PUBLIC(void ) ETag_surfxml_argument(void); - -/* XML application data. */ -typedef enum { AU_surfxml_random_generator, A_surfxml_random_generator_DRAND48,A_surfxml_random_generator_RAND } AT_surfxml_random_generator; -typedef int AT_surfxml_prop_id; -#define AU_surfxml_prop_id NULL -typedef int AT_surfxml_host_interference_recv; -#define AU_surfxml_host_interference_recv NULL -typedef int AT_surfxml_host_id; -#define AU_surfxml_host_id NULL -typedef int AT_surfxml_set_id; -#define AU_surfxml_set_id NULL -typedef int AT_surfxml_link_latency_file; -#define AU_surfxml_link_latency_file NULL -typedef enum { AU_surfxml_host_state, A_surfxml_host_state_ON,A_surfxml_host_state_OFF } AT_surfxml_host_state; -typedef int AT_surfxml_host_interference_send_recv; -#define AU_surfxml_host_interference_send_recv NULL -typedef int AT_surfxml_host_interference_send; -#define AU_surfxml_host_interference_send NULL -typedef int AT_surfxml_set_suffix; -#define AU_surfxml_set_suffix NULL -typedef int AT_surfxml_route_impact_on_dst; -#define AU_surfxml_route_impact_on_dst NULL -typedef int AT_surfxml_host_power; -#define AU_surfxml_host_power NULL -typedef int AT_surfxml_router_id; -#define AU_surfxml_router_id NULL -typedef int AT_surfxml_process_start_time; -#define AU_surfxml_process_start_time NULL -typedef int AT_surfxml_cluster_suffix; -#define AU_surfxml_cluster_suffix NULL -typedef int AT_surfxml_platform_xmlns_c_route; -#define AU_surfxml_platform_xmlns_c_route NULL -typedef int AT_surfxml_cluster_prefix; -#define AU_surfxml_cluster_prefix NULL -typedef int AT_surfxml_trace_file; -#define AU_surfxml_trace_file NULL -typedef enum { AU_surfxml_route_action, A_surfxml_route_action_POSTPEND,A_surfxml_route_action_PREPEND,A_surfxml_route_action_OVERRIDE } AT_surfxml_route_action; -typedef enum { AU_surfxml_link_sharing_policy, A_surfxml_link_sharing_policy_SHARED,A_surfxml_link_sharing_policy_FATPIPE } AT_surfxml_link_sharing_policy; -typedef int AT_surfxml_random_min; -#define AU_surfxml_random_min NULL -typedef int AT_surfxml_process_kill_time; -#define AU_surfxml_process_kill_time NULL -typedef int AT_surfxml_cluster_bb_bw; -#define AU_surfxml_cluster_bb_bw NULL -typedef enum { AU_surfxml_trace_c_connect_element, A_surfxml_trace_c_connect_element_HOST,A_surfxml_trace_c_connect_element_LINK } AT_surfxml_trace_c_connect_element; -typedef int AT_surfxml_argument_value; -#define AU_surfxml_argument_value NULL -typedef enum { AU_surfxml_link_state, A_surfxml_link_state_ON,A_surfxml_link_state_OFF } AT_surfxml_link_state; -typedef int AT_surfxml_route_impact_on_src; -#define AU_surfxml_route_impact_on_src NULL -typedef int AT_surfxml_link_bandwidth; -#define AU_surfxml_link_bandwidth NULL -typedef int AT_surfxml_cluster_id; -#define AU_surfxml_cluster_id NULL -typedef int AT_surfxml_random_mean; -#define AU_surfxml_random_mean NULL -typedef int AT_surfxml_cluster_bb_lat; -#define AU_surfxml_cluster_bb_lat NULL -typedef int AT_surfxml_link_latency; -#define AU_surfxml_link_latency NULL -typedef int AT_surfxml_trace_c_connect_trace_id; -#define AU_surfxml_trace_c_connect_trace_id NULL -typedef int AT_surfxml_platform_xmlns_c_link; -#define AU_surfxml_platform_xmlns_c_link NULL -typedef int AT_surfxml_link_bandwidth_file; -#define AU_surfxml_link_bandwidth_file NULL -typedef int AT_surfxml_random_id; -#define AU_surfxml_random_id NULL -typedef int AT_surfxml_set_radical; -#define AU_surfxml_set_radical NULL -typedef int AT_surfxml_random_max; -#define AU_surfxml_random_max NULL -typedef int AT_surfxml_link_id; -#define AU_surfxml_link_id NULL -typedef int AT_surfxml_process_host; -#define AU_surfxml_process_host NULL -typedef int AT_surfxml_host_availability_file; -#define AU_surfxml_host_availability_file NULL -typedef int AT_surfxml_cluster_lat; -#define AU_surfxml_cluster_lat NULL -typedef int AT_surfxml_trace_periodicity; -#define AU_surfxml_trace_periodicity NULL -typedef int AT_surfxml_foreach_set_id; -#define AU_surfxml_foreach_set_id NULL -typedef int AT_surfxml_route_impact_on_dst_with_other_send; -#define AU_surfxml_route_impact_on_dst_with_other_send NULL -typedef int AT_surfxml_prop_value; -#define AU_surfxml_prop_value NULL -typedef int AT_surfxml_route_impact_on_src_with_other_recv; -#define AU_surfxml_route_impact_on_src_with_other_recv NULL -typedef int AT_surfxml_link_state_file; -#define AU_surfxml_link_state_file NULL -typedef int AT_surfxml_set_prefix; -#define AU_surfxml_set_prefix NULL -typedef int AT_surfxml_cluster_power; -#define AU_surfxml_cluster_power NULL -typedef int AT_surfxml_process_function; -#define AU_surfxml_process_function NULL -typedef int AT_surfxml_host_max_outgoing_rate; -#define AU_surfxml_host_max_outgoing_rate NULL -typedef int AT_surfxml_link_c_ctn_id; -#define AU_surfxml_link_c_ctn_id NULL -typedef int AT_surfxml_host_availability; -#define AU_surfxml_host_availability NULL -typedef int AT_surfxml_route_src; -#define AU_surfxml_route_src NULL -typedef int AT_surfxml_route_c_multi_src; -#define AU_surfxml_route_c_multi_src NULL -typedef enum { AU_surfxml_route_c_multi_action, A_surfxml_route_c_multi_action_POSTPEND,A_surfxml_route_c_multi_action_PREPEND,A_surfxml_route_c_multi_action_OVERRIDE } AT_surfxml_route_c_multi_action; -typedef int AT_surfxml_trace_id; -#define AU_surfxml_trace_id NULL -typedef int AT_surfxml_cluster_radical; -#define AU_surfxml_cluster_radical NULL -typedef int AT_surfxml_include_file; -#define AU_surfxml_include_file NULL -typedef int AT_surfxml_random_std_deviation; -#define AU_surfxml_random_std_deviation NULL -typedef enum { AU_surfxml_trace_c_connect_kind, A_surfxml_trace_c_connect_kind_AVAILABILITY,A_surfxml_trace_c_connect_kind_BANDWIDTH,A_surfxml_trace_c_connect_kind_LATENCY,A_surfxml_trace_c_connect_kind_POWER } AT_surfxml_trace_c_connect_kind; -typedef int AT_surfxml_trace_c_connect_connector_id; -#define AU_surfxml_trace_c_connect_connector_id NULL -typedef int AT_surfxml_route_c_multi_dst; -#define AU_surfxml_route_c_multi_dst NULL -typedef int AT_surfxml_host_state_file; -#define AU_surfxml_host_state_file NULL -typedef enum { AU_surfxml_route_c_multi_symmetric, A_surfxml_route_c_multi_symmetric_YES,A_surfxml_route_c_multi_symmetric_NO } AT_surfxml_route_c_multi_symmetric; -typedef int AT_surfxml_route_dst; -#define AU_surfxml_route_dst NULL -typedef int AT_surfxml_cluster_bw; -#define AU_surfxml_cluster_bw NULL -typedef int AT_surfxml_platform_version; -#define AU_surfxml_platform_version NULL - -/* FleXML-provided data. */ -XBT_PUBLIC_DATA(int ) surfxml_pcdata_ix; -XBT_PUBLIC_DATA(char *) surfxml_bufferstack; -#define surfxml_pcdata (surfxml_bufferstack + surfxml_pcdata_ix) -XBT_PUBLIC_DATA(AT_surfxml_random_generator ) AX_surfxml_random_generator; -#define A_surfxml_random_generator AX_surfxml_random_generator -XBT_PUBLIC_DATA(AT_surfxml_prop_id ) AX_surfxml_prop_id; -#define A_surfxml_prop_id (surfxml_bufferstack + AX_surfxml_prop_id) -XBT_PUBLIC_DATA(AT_surfxml_host_interference_recv ) AX_surfxml_host_interference_recv; -#define A_surfxml_host_interference_recv (surfxml_bufferstack + AX_surfxml_host_interference_recv) -XBT_PUBLIC_DATA(AT_surfxml_host_id ) AX_surfxml_host_id; -#define A_surfxml_host_id (surfxml_bufferstack + AX_surfxml_host_id) -XBT_PUBLIC_DATA(AT_surfxml_set_id ) AX_surfxml_set_id; -#define A_surfxml_set_id (surfxml_bufferstack + AX_surfxml_set_id) -XBT_PUBLIC_DATA(AT_surfxml_link_latency_file ) AX_surfxml_link_latency_file; -#define A_surfxml_link_latency_file (surfxml_bufferstack + AX_surfxml_link_latency_file) -XBT_PUBLIC_DATA(AT_surfxml_host_state ) AX_surfxml_host_state; -#define A_surfxml_host_state AX_surfxml_host_state -XBT_PUBLIC_DATA(AT_surfxml_host_interference_send_recv ) AX_surfxml_host_interference_send_recv; -#define A_surfxml_host_interference_send_recv (surfxml_bufferstack + AX_surfxml_host_interference_send_recv) -XBT_PUBLIC_DATA(AT_surfxml_host_interference_send ) AX_surfxml_host_interference_send; -#define A_surfxml_host_interference_send (surfxml_bufferstack + AX_surfxml_host_interference_send) -XBT_PUBLIC_DATA(AT_surfxml_set_suffix ) AX_surfxml_set_suffix; -#define A_surfxml_set_suffix (surfxml_bufferstack + AX_surfxml_set_suffix) -XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_dst ) AX_surfxml_route_impact_on_dst; -#define A_surfxml_route_impact_on_dst (surfxml_bufferstack + AX_surfxml_route_impact_on_dst) -XBT_PUBLIC_DATA(AT_surfxml_host_power ) AX_surfxml_host_power; -#define A_surfxml_host_power (surfxml_bufferstack + AX_surfxml_host_power) -XBT_PUBLIC_DATA(AT_surfxml_router_id ) AX_surfxml_router_id; -#define A_surfxml_router_id (surfxml_bufferstack + AX_surfxml_router_id) -XBT_PUBLIC_DATA(AT_surfxml_process_start_time ) AX_surfxml_process_start_time; -#define A_surfxml_process_start_time (surfxml_bufferstack + AX_surfxml_process_start_time) -XBT_PUBLIC_DATA(AT_surfxml_cluster_suffix ) AX_surfxml_cluster_suffix; -#define A_surfxml_cluster_suffix (surfxml_bufferstack + AX_surfxml_cluster_suffix) -XBT_PUBLIC_DATA(AT_surfxml_platform_xmlns_c_route ) AX_surfxml_platform_xmlns_c_route; -#define A_surfxml_platform_xmlns_c_route (surfxml_bufferstack + AX_surfxml_platform_xmlns_c_route) -XBT_PUBLIC_DATA(AT_surfxml_cluster_prefix ) AX_surfxml_cluster_prefix; -#define A_surfxml_cluster_prefix (surfxml_bufferstack + AX_surfxml_cluster_prefix) -XBT_PUBLIC_DATA(AT_surfxml_trace_file ) AX_surfxml_trace_file; -#define A_surfxml_trace_file (surfxml_bufferstack + AX_surfxml_trace_file) -XBT_PUBLIC_DATA(AT_surfxml_route_action ) AX_surfxml_route_action; -#define A_surfxml_route_action AX_surfxml_route_action -XBT_PUBLIC_DATA(AT_surfxml_link_sharing_policy ) AX_surfxml_link_sharing_policy; -#define A_surfxml_link_sharing_policy AX_surfxml_link_sharing_policy -XBT_PUBLIC_DATA(AT_surfxml_random_min ) AX_surfxml_random_min; -#define A_surfxml_random_min (surfxml_bufferstack + AX_surfxml_random_min) -XBT_PUBLIC_DATA(AT_surfxml_process_kill_time ) AX_surfxml_process_kill_time; -#define A_surfxml_process_kill_time (surfxml_bufferstack + AX_surfxml_process_kill_time) -XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_bw ) AX_surfxml_cluster_bb_bw; -#define A_surfxml_cluster_bb_bw (surfxml_bufferstack + AX_surfxml_cluster_bb_bw) -XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_element ) AX_surfxml_trace_c_connect_element; -#define A_surfxml_trace_c_connect_element AX_surfxml_trace_c_connect_element -XBT_PUBLIC_DATA(AT_surfxml_argument_value ) AX_surfxml_argument_value; -#define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value) -XBT_PUBLIC_DATA(AT_surfxml_link_state ) AX_surfxml_link_state; -#define A_surfxml_link_state AX_surfxml_link_state -XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_src ) AX_surfxml_route_impact_on_src; -#define A_surfxml_route_impact_on_src (surfxml_bufferstack + AX_surfxml_route_impact_on_src) -XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth ) AX_surfxml_link_bandwidth; -#define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth) -XBT_PUBLIC_DATA(AT_surfxml_cluster_id ) AX_surfxml_cluster_id; -#define A_surfxml_cluster_id (surfxml_bufferstack + AX_surfxml_cluster_id) -XBT_PUBLIC_DATA(AT_surfxml_random_mean ) AX_surfxml_random_mean; -#define A_surfxml_random_mean (surfxml_bufferstack + AX_surfxml_random_mean) -XBT_PUBLIC_DATA(AT_surfxml_cluster_bb_lat ) AX_surfxml_cluster_bb_lat; -#define A_surfxml_cluster_bb_lat (surfxml_bufferstack + AX_surfxml_cluster_bb_lat) -XBT_PUBLIC_DATA(AT_surfxml_link_latency ) AX_surfxml_link_latency; -#define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency) -XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_trace_id ) AX_surfxml_trace_c_connect_trace_id; -#define A_surfxml_trace_c_connect_trace_id (surfxml_bufferstack + AX_surfxml_trace_c_connect_trace_id) -XBT_PUBLIC_DATA(AT_surfxml_platform_xmlns_c_link ) AX_surfxml_platform_xmlns_c_link; -#define A_surfxml_platform_xmlns_c_link (surfxml_bufferstack + AX_surfxml_platform_xmlns_c_link) -XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth_file ) AX_surfxml_link_bandwidth_file; -#define A_surfxml_link_bandwidth_file (surfxml_bufferstack + AX_surfxml_link_bandwidth_file) -XBT_PUBLIC_DATA(AT_surfxml_random_id ) AX_surfxml_random_id; -#define A_surfxml_random_id (surfxml_bufferstack + AX_surfxml_random_id) -XBT_PUBLIC_DATA(AT_surfxml_set_radical ) AX_surfxml_set_radical; -#define A_surfxml_set_radical (surfxml_bufferstack + AX_surfxml_set_radical) -XBT_PUBLIC_DATA(AT_surfxml_random_max ) AX_surfxml_random_max; -#define A_surfxml_random_max (surfxml_bufferstack + AX_surfxml_random_max) -XBT_PUBLIC_DATA(AT_surfxml_link_id ) AX_surfxml_link_id; -#define A_surfxml_link_id (surfxml_bufferstack + AX_surfxml_link_id) -XBT_PUBLIC_DATA(AT_surfxml_process_host ) AX_surfxml_process_host; -#define A_surfxml_process_host (surfxml_bufferstack + AX_surfxml_process_host) -XBT_PUBLIC_DATA(AT_surfxml_host_availability_file ) AX_surfxml_host_availability_file; -#define A_surfxml_host_availability_file (surfxml_bufferstack + AX_surfxml_host_availability_file) -XBT_PUBLIC_DATA(AT_surfxml_cluster_lat ) AX_surfxml_cluster_lat; -#define A_surfxml_cluster_lat (surfxml_bufferstack + AX_surfxml_cluster_lat) -XBT_PUBLIC_DATA(AT_surfxml_trace_periodicity ) AX_surfxml_trace_periodicity; -#define A_surfxml_trace_periodicity (surfxml_bufferstack + AX_surfxml_trace_periodicity) -XBT_PUBLIC_DATA(AT_surfxml_foreach_set_id ) AX_surfxml_foreach_set_id; -#define A_surfxml_foreach_set_id (surfxml_bufferstack + AX_surfxml_foreach_set_id) -XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_dst_with_other_send ) AX_surfxml_route_impact_on_dst_with_other_send; -#define A_surfxml_route_impact_on_dst_with_other_send (surfxml_bufferstack + AX_surfxml_route_impact_on_dst_with_other_send) -XBT_PUBLIC_DATA(AT_surfxml_prop_value ) AX_surfxml_prop_value; -#define A_surfxml_prop_value (surfxml_bufferstack + AX_surfxml_prop_value) -XBT_PUBLIC_DATA(AT_surfxml_route_impact_on_src_with_other_recv ) AX_surfxml_route_impact_on_src_with_other_recv; -#define A_surfxml_route_impact_on_src_with_other_recv (surfxml_bufferstack + AX_surfxml_route_impact_on_src_with_other_recv) -XBT_PUBLIC_DATA(AT_surfxml_link_state_file ) AX_surfxml_link_state_file; -#define A_surfxml_link_state_file (surfxml_bufferstack + AX_surfxml_link_state_file) -XBT_PUBLIC_DATA(AT_surfxml_set_prefix ) AX_surfxml_set_prefix; -#define A_surfxml_set_prefix (surfxml_bufferstack + AX_surfxml_set_prefix) -XBT_PUBLIC_DATA(AT_surfxml_cluster_power ) AX_surfxml_cluster_power; -#define A_surfxml_cluster_power (surfxml_bufferstack + AX_surfxml_cluster_power) -XBT_PUBLIC_DATA(AT_surfxml_process_function ) AX_surfxml_process_function; -#define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function) -XBT_PUBLIC_DATA(AT_surfxml_host_max_outgoing_rate ) AX_surfxml_host_max_outgoing_rate; -#define A_surfxml_host_max_outgoing_rate (surfxml_bufferstack + AX_surfxml_host_max_outgoing_rate) -XBT_PUBLIC_DATA(AT_surfxml_link_c_ctn_id ) AX_surfxml_link_c_ctn_id; -#define A_surfxml_link_c_ctn_id (surfxml_bufferstack + AX_surfxml_link_c_ctn_id) -XBT_PUBLIC_DATA(AT_surfxml_host_availability ) AX_surfxml_host_availability; -#define A_surfxml_host_availability (surfxml_bufferstack + AX_surfxml_host_availability) -XBT_PUBLIC_DATA(AT_surfxml_route_src ) AX_surfxml_route_src; -#define A_surfxml_route_src (surfxml_bufferstack + AX_surfxml_route_src) -XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_src ) AX_surfxml_route_c_multi_src; -#define A_surfxml_route_c_multi_src (surfxml_bufferstack + AX_surfxml_route_c_multi_src) -XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_action ) AX_surfxml_route_c_multi_action; -#define A_surfxml_route_c_multi_action AX_surfxml_route_c_multi_action -XBT_PUBLIC_DATA(AT_surfxml_trace_id ) AX_surfxml_trace_id; -#define A_surfxml_trace_id (surfxml_bufferstack + AX_surfxml_trace_id) -XBT_PUBLIC_DATA(AT_surfxml_cluster_radical ) AX_surfxml_cluster_radical; -#define A_surfxml_cluster_radical (surfxml_bufferstack + AX_surfxml_cluster_radical) -XBT_PUBLIC_DATA(AT_surfxml_include_file ) AX_surfxml_include_file; -#define A_surfxml_include_file (surfxml_bufferstack + AX_surfxml_include_file) -XBT_PUBLIC_DATA(AT_surfxml_random_std_deviation ) AX_surfxml_random_std_deviation; -#define A_surfxml_random_std_deviation (surfxml_bufferstack + AX_surfxml_random_std_deviation) -XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_kind ) AX_surfxml_trace_c_connect_kind; -#define A_surfxml_trace_c_connect_kind AX_surfxml_trace_c_connect_kind -XBT_PUBLIC_DATA(AT_surfxml_trace_c_connect_connector_id ) AX_surfxml_trace_c_connect_connector_id; -#define A_surfxml_trace_c_connect_connector_id (surfxml_bufferstack + AX_surfxml_trace_c_connect_connector_id) -XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_dst ) AX_surfxml_route_c_multi_dst; -#define A_surfxml_route_c_multi_dst (surfxml_bufferstack + AX_surfxml_route_c_multi_dst) -XBT_PUBLIC_DATA(AT_surfxml_host_state_file ) AX_surfxml_host_state_file; -#define A_surfxml_host_state_file (surfxml_bufferstack + AX_surfxml_host_state_file) -XBT_PUBLIC_DATA(AT_surfxml_route_c_multi_symmetric ) AX_surfxml_route_c_multi_symmetric; -#define A_surfxml_route_c_multi_symmetric AX_surfxml_route_c_multi_symmetric -XBT_PUBLIC_DATA(AT_surfxml_route_dst ) AX_surfxml_route_dst; -#define A_surfxml_route_dst (surfxml_bufferstack + AX_surfxml_route_dst) -XBT_PUBLIC_DATA(AT_surfxml_cluster_bw ) AX_surfxml_cluster_bw; -#define A_surfxml_cluster_bw (surfxml_bufferstack + AX_surfxml_cluster_bw) -XBT_PUBLIC_DATA(AT_surfxml_platform_version ) AX_surfxml_platform_version; -#define A_surfxml_platform_version (surfxml_bufferstack + AX_surfxml_platform_version) - -/* XML application utilities. */ -XBT_PUBLIC(int ) surfxml_element_context(int); - -/* XML processor entry point. */ -XBT_PUBLIC(int ) yylex(void); - -/* Flexml error handling function (useful only when -q flag passed to flexml) */ -const char * surfxml_parse_err_msg(void); -#endif diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h index a8b5e5c187..e7085e29ea 100644 --- a/include/surf/surfxml_parse.h +++ b/include/surf/surfxml_parse.h @@ -9,7 +9,7 @@ #define _SURF_SURFXML_PARSE_H #include /* to have FILE */ -#include "surf/surfxml.h" +#include "surf/simgrid_dtd.h" #include "xbt/function_types.h" #include "xbt/dict.h" -- 2.20.1